extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent first event in the range from filling in empty dates when using 2432day/date2432

Browse Source
This commit is contained in:
Nathan Gray 2011-02-18 15:30:21 +00:00
parent dfa96ca0a6
commit f41e44fee7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,10 +221,11 @@ class calendar_merge extends bo_merge
if(strpos($repeat, '$$day/date$$') !== false) { if(strpos($repeat, '$$day/date$$') !== false) {
$date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day))); $date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)));
if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) { if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) {
$days[date('Ymd',$_date)][date('l',strtotime($day))] = array($date_marker); $blank = $this->calendar_replacements(array());
} else { foreach($blank as &$value) $value = '';
$days[date('Ymd',$_date)][date('l',strtotime($day))][0] += $date_marker; $days[date('Ymd',$_date)][date('l',strtotime($day))][] = $blank;
} }
$days[date('Ymd',$_date)][date('l',strtotime($day))][0] += $date_marker;
} }
} }
return $days[date('Ymd',$_date)][$plugin][0]; return $days[date('Ymd',$_date)][$plugin][0];
@ -289,10 +290,11 @@ class calendar_merge extends bo_merge
if(strpos($repeat, '$$day/date$$') !== false) { if(strpos($repeat, '$$day/date$$') !== false) {
$date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day))); $date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)));
if(!is_array($days[date('Ymd',$_date)][$plugin])) { if(!is_array($days[date('Ymd',$_date)][$plugin])) {
$days[date('Ymd',$_date)][$plugin] = array($date_marker); $blank = $this->calendar_replacements(array());
} else { foreach($blank as &$value) $value = '';
$days[date('Ymd',$_date)][$plugin][0] += $date_marker; $days[date('Ymd',$_date)][$plugin][] = $blank;
} }
$days[date('Ymd',$_date)][$plugin][0] += $date_marker;
} }
} }
return $days[date('Ymd',$_date)][$plugin][0]; return $days[date('Ymd',$_date)][$plugin][0];