Skip to content

Commit

Permalink
Don't use localized date string to instantiate Horde_Date object.
Browse files Browse the repository at this point in the history
Fixes Bug: 14076
  • Loading branch information
mrubinsk committed Aug 9, 2015
1 parent 63b3faf commit 9bcc097
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion imp/lib/Mime/Viewer/Itip.php
Expand Up @@ -407,6 +407,7 @@ protected function _vEvent($vevent, $id, $method = 'PUBLISH', $components = arra
$view->start = is_array($start)
? strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $start['month'], $start['mday'], $start['year']))
: strftime($prefs->getValue('date_format'), $start) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $start);
$start_date = new Horde_Date($start);
} catch (Horde_Icalendar_Exception $e) {
$start = null;
}
Expand Down Expand Up @@ -444,7 +445,7 @@ protected function _vEvent($vevent, $id, $method = 'PUBLISH', $components = arra
$rrule = array();
}
if (!is_array($rrule)) {
$recurrence = new Horde_Date_Recurrence(new Horde_Date($view->start));
$recurrence = new Horde_Date_Recurrence($start_date);
if (strpos($rrule, '=') !== false) {
$recurrence->fromRRule20($rrule);
} else {
Expand Down

0 comments on commit 9bcc097

Please sign in to comment.