gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec, 1.19.2.6, 1.19.2.7 issue3558.patch, 1.1.2.1, 1.1.2.2

cvs at kolab.org cvs at kolab.org
Sat Apr 18 22:47:01 CEST 2009


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv24347

Modified Files:
      Tag: kolab_2_2_branch
	Kolab_Filter.spec issue3558.patch 
Log Message:
Do not substract a day. I'm still confused why the old code might have had any needs to do that.  kolab/issue3558 (whole-day events broken for resources)

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.6
retrieving revision 1.19.2.7
diff -u -d -r1.19.2.6 -r1.19.2.7
--- Kolab_Filter.spec	17 Apr 2009 14:30:19 -0000	1.19.2.6
+++ Kolab_Filter.spec	18 Apr 2009 20:46:59 -0000	1.19.2.7
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20090417
+%define         V_release 20090418
 
 # Package Information
 Name:	   %{V_package}

Index: issue3558.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Attic/issue3558.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- issue3558.patch	16 Apr 2009 18:55:03 -0000	1.1.2.1
+++ issue3558.patch	18 Apr 2009 20:46:59 -0000	1.1.2.2
@@ -1,6 +1,6 @@
---- a/lib/Horde/Kolab/Resource.php.orig	2009-04-16 20:00:58.000000000 +0200
-+++ b/lib/Horde/Kolab/Resource.php	2009-04-16 20:46:05.000000000 +0200
-@@ -247,8 +247,17 @@
+--- /kolab/RPM/TMP/Kolab_Filter-0.1.4/lib/Horde/Kolab/Resource.php.orig	2009-04-16 20:48:29.000000000 +0200
++++ /kolab/lib/php/Horde/Kolab/Resource.php	2009-04-18 22:43:11.000000000 +0200
+@@ -247,8 +247,12 @@
          $object['summary'] = $itip->getAttributeDefault('SUMMARY', '');
          $object['location'] = $itip->getAttributeDefault('LOCATION', '');
          $object['body'] = $itip->getAttributeDefault('DESCRIPTION', '');
@@ -9,18 +9,13 @@
 +        $dtend = $itip->getAttributeDefault('DTEND', '');
 +        if (is_array($dtend)) {
 +            $object['_is_all_day'] = true;
-+            /**
-+             * Substract a day (86400 seconds) using epochs to take number of
-+             * days per month into account
-+             */
-+            $dtend = $this->convert2epoch($dtend) - 86400;
 +        }
 +        $object['start-date'] = $this->convert2epoch($itip->getAttributeDefault('DTSTART', ''));
 +        $object['end-date'] = $this->convert2epoch($dtend);
          if ($itip->getAttributeDefault('TRANSP', 'OPAQUE') == 'TRANSPARENT') {
              $object['show-time-as'] = $itip->getAttributeDefault('DTEND', '');
          }
-@@ -997,17 +1006,16 @@
+@@ -997,17 +1001,16 @@
       */
      function cleanArray($ical_date)
      {





More information about the commits mailing list