[eGroupWare-svn] r33845 - /trunk/calendar/inc/class.calendar_merge.inc.php

[<nat...@us...>]

Author: nathangray
Date: Fri Feb 18 16:30:21 2011
New Revision: 33845

URL: http://www.egroupware.org/viewvc/egroupware?rev=33845&view=rev
Log:
Prevent first event in the range from filling in empty dates when using 2432day/date2432

Modified:
    trunk/calendar/inc/class.calendar_merge.inc.php

Modified: trunk/calendar/inc/class.calendar_merge.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/calendar/inc/class.calendar_merge.inc.php?rev=33845&r1=33844&r2=33845&view=diff
==============================================================================
--- trunk/calendar/inc/class.calendar_merge.inc.php (original)
+++ trunk/calendar/inc/class.calendar_merge.inc.php Fri Feb 18 16:30:21 2011
@@ -221,10 +221,11 @@
 			if(strpos($repeat, '$$day/date$$') !== false) {
 				$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))])) {
-					 $days[date('Ymd',$_date)][date('l',strtotime($day))] = array($date_marker);
-				} else {
-					 $days[date('Ymd',$_date)][date('l',strtotime($day))][0] += $date_marker;
+					$blank = $this->calendar_replacements(array());
+					foreach($blank as &$value) $value = '';
+					$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];
@@ -289,10 +290,11 @@
 			if(strpos($repeat, '$$day/date$$') !== false) {
 				$date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)));
 				if(!is_array($days[date('Ymd',$_date)][$plugin])) {
-					 $days[date('Ymd',$_date)][$plugin] = array($date_marker);
-				} else {
-					 $days[date('Ymd',$_date)][$plugin][0] += $date_marker;
+					$blank = $this->calendar_replacements(array());
+					foreach($blank as &$value) $value = '';
+					$days[date('Ymd',$_date)][$plugin][] = $blank;
 				}
+				$days[date('Ymd',$_date)][$plugin][0] += $date_marker;
 			}
 		}
 		return $days[date('Ymd',$_date)][$plugin][0];