holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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:22:28 +00:00
parent 262d8d6440
commit d5cceaf7d6
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'),
) as $name => $format)
{
$value = date($format,$event[$what]);
$value = egw_time::to($event[$what],$format);
if ($format == 'l') $value = lang($value);
$replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value;
}