gunnar: server/patches/horde-webmail/1.2.0/tg t_kronolith_HK_GW_HandleEmptyDates.diff, NONE, 1.1.2.1 series, 1.5.2.11, 1.5.2.12

cvs at kolab.org cvs at kolab.org
Tue Nov 24 08:04:48 CET 2009


Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv23367/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_GW_HandleEmptyDates.diff 
Log Message:
 kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error compareDateTime())

--- NEW FILE: t_kronolith_HK_GW_HandleEmptyDates.diff ---
From: root <Gunnar Wrobel wrobel at pardus.de>
Subject: [PATCH] t/kronolith/HK/GW/HandleEmptyDates

Enables the Kolab driver to handle empty start and/or end dates
correctly.

REF: https://issues.kolab.org/issue3656

Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>

---
 horde-webmail/kronolith/lib/Driver/kolab.php |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/horde-webmail/kronolith/lib/Driver/kolab.php b/horde-webmail/kronolith/lib/Driver/kolab.php
index de49c81..e915475 100644
--- a/horde-webmail/kronolith/lib/Driver/kolab.php
+++ b/horde-webmail/kronolith/lib/Driver/kolab.php
@@ -1134,12 +1134,18 @@ class Kronolith_Driver_kolab_wrapper_new extends Kronolith_Driver_kolab_wrapper
             return $result;
         }
 
-        if (is_null($startDate)) {
+        if (empty($startDate)) {
             $startDate = &new Horde_Date(array('mday' => 1, 'month' => 1, 'year' => 0000));
         }
-        if (is_null($endDate)) {
+        if (empty($endDate)) {
             $endDate = &new Horde_Date(array('mday' => 31, 'month' => 12, 'year' => 9999));
         }
+        if (!is_a($startDate, 'Horde_Date')) {
+            $startDate = &new Horde_Date($startDate);
+        }
+        if (!is_a($endDate, 'Horde_Date')) {
+            $endDate = &new Horde_Date($endDate);
+        }
 
         $ids = array();
 
-- 
tg: (e6faeaf..) t/kronolith/HK/GW/HandleEmptyDates (depends on: t/framework/H/JS/Form/FixFormSecurityForImageUploads)
-- 
TOPGIT patch commit log
=======================

commit be56600b19e429f4ece1ca685c1e25550b5a02f6
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 07:37:58 2009 +0100

    Enables the Kolab driver to handle empty start and/or end dates
    correctly.
    
    REF: https://issues.kolab.org/issue3656

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -d -r1.5.2.11 -r1.5.2.12
--- series	10 Nov 2009 17:33:25 -0000	1.5.2.11
+++ series	24 Nov 2009 07:04:45 -0000	1.5.2.12
@@ -76,3 +76,4 @@
 t_kronolith_HK_UV_dateInputFieldOrder.diff -p1
 t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff -p1
 t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff -p1
+t_kronolith_HK_GW_HandleEmptyDates.diff -p1
\ No newline at end of file





More information about the commits mailing list