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

Add date to starttime & endtime for multi-day events

Browse Source
This commit is contained in:
Nathan Gray 2011-03-28 16:24:36 +00:00
parent e5bb02d799
commit 267241e149
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

@ -162,7 +162,7 @@ class calendar_merge extends bo_merge
foreach(array( foreach(array(
'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], 'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],
'day' => 'l', 'day' => 'l',
'time' => $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 = date($format,$event[$what]);