com web/php: Fixes bug #55387.: include/layout.inc

Commit: ac441eb9b4e8f9fdf9d7d54f392c780bd480a367 Author: danbrown <danbrown@php.net> Tue, 1 Oct 2013 15:55:27 -0400 Parents: 1db878b68bd33c1ec15f454068bea157fd38879e Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=ac441eb9b4e8f9fdf9d7d54f392c780bd480a367 Log: Fixes bug #55387. Bugs: https://bugs.php.net/55387 Changed paths: M include/layout.inc Diff: diff --git a/include/layout.inc b/include/layout.inc index 567e44b..bcad2bc 100644 --- a/include/layout.inc +++ b/include/layout.inc @@ -638,7 +638,7 @@ function display_event($event, $include_date = 1) // Weekday names array for ($i = 1; $i <= 7; $i++) { - $days[$i] = strftime('%A', mktime(12, 0, 0, 4, $i, 2001)); + $days[$i] = strftime('%A', mktime(12, 0, 0, 4, $i)); } // Recurring possibilities @@ -652,8 +652,17 @@ function display_event($event, $include_date = 1) -3 => '3rd Last' ); - $sday = (isset($event['start']) && !empty($event['start'])) ? strtotime($event['start']) : 0; - $eday = (isset($event['end']) && !empty($event['end'])) ? strtotime($event['end']) : 0; + if (!isset($event['start']) && isset($event['sday'])) { + $sday = mktime(12,0,0,$event['smonth'],$event['sday'],$event['syear']); + } else { + $sday = (isset($event['start']) && !empty($event['start'])) ? strtotime($event['start']) : 0; + } + + if (!isset($event['end']) && isset($event['eday'])) { + $eday = mktime(12,0,0,$event['emonth'],$event['eday'],$event['eyear']); + } else { + $eday = (isset($event['end']) && !empty($event['end'])) ? strtotime($event['end']) : 0; + } ?> <table border="0" cellspacing="0" cellpadding="3" width="100%" class="vevent"> <tr bgcolor="#dddddd"><td>