summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-04-18 20:46:59 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-04-18 20:46:59 (GMT)
commitfef1fa3b58d23147e2c21777c69b0e07187e9e79 (patch)
tree363b6ae5ab33eb61ccdfd9f1dd009bd446528852
parentdacaa0b6065a1db73da91cd29be8cdf16894b732 (diff)
downloadserver-fef1fa3b58d23147e2c21777c69b0e07187e9e79.tar.gz
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)
-rw-r--r--php-kolab/Kolab_Filter/Kolab_Filter.spec2
-rw-r--r--php-kolab/Kolab_Filter/issue3558.patch13
2 files changed, 5 insertions, 10 deletions
diff --git a/php-kolab/Kolab_Filter/Kolab_Filter.spec b/php-kolab/Kolab_Filter/Kolab_Filter.spec
index 82fa4c0..2a02511 100644
--- a/php-kolab/Kolab_Filter/Kolab_Filter.spec
+++ b/php-kolab/Kolab_Filter/Kolab_Filter.spec
@@ -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}
diff --git a/php-kolab/Kolab_Filter/issue3558.patch b/php-kolab/Kolab_Filter/issue3558.patch
index 6ed80ce..66e50bc 100644
--- a/php-kolab/Kolab_Filter/issue3558.patch
+++ b/php-kolab/Kolab_Filter/issue3558.patch
@@ -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)
{