lib/kolab_sync_data.php
Aleksander Machniak
machniak at kolabsys.com
Mon Dec 31 18:16:16 CET 2012
lib/kolab_sync_data.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 57f93f13419fa78cf3f479a1729a7ab3c0d84bad
Author: Aleksander Machniak <alec at alec.pl>
Date: Mon Dec 31 18:15:39 2012 +0100
Fix handling of invalid input to date_from_kolab() (Bug #1497)
diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
index 2f9fc36..b54d263 100644
--- a/lib/kolab_sync_data.php
+++ b/lib/kolab_sync_data.php
@@ -993,7 +993,7 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
else if (is_string($date)) {
$date = new DateTime($date, new DateTimeZone('UTC'));
}
- else {
+ else if ($date instanceof DateTime) {
$date = clone $date;
$tz = $date->getTimezone();
$tz_name = $tz->getName();
@@ -1003,6 +1003,9 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
$date->setTimezone(new DateTimeZone('UTC'));
}
}
+ else {
+ return null; // invalid input
+ }
return $date;
}
More information about the commits
mailing list