extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 12:41:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merged dates from the event list were not timestamps, and could not be formatted

Browse Source
This commit is contained in:
Nathan Gray 2015-07-22 14:27:45 +00:00
parent c1630b5729
commit 60919a6dc1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_merge.inc.php
View File

@ -220,7 +220,7 @@ class calendar_merge extends bo_merge
'time' => (date('Ymd',$event['start']) != date('Ymd',$event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '') . ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'), 'time' => (date('Ymd',$event['start']) != date('Ymd',$event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '') . ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'),
) as $name => $format) ) as $name => $format)
{ {
$value = date($format,$event[$what]); $value = egw_time::to($event[$what],$format);
if ($format == 'l') $value = lang($value); if ($format == 'l') $value = lang($value);
$replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value; $replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value;
} }