[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.128, 1.129

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7471/functions

Modified Files:
	template.php 
Log Message:
Merge with 2.4 branch

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** template.php	12 May 2010 17:11:13 -0000	1.128
--- template.php	26 May 2010 15:03:12 -0000	1.129
***************
*** 187,191 ****
  					$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', '', $events_tmp);
  				}else{
! 					$some_exceptions = "";
  					foreach ($val['exceptions'] as $except_val){
  						$except_tmp	= $loop_except;
--- 187,191 ----
  					$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', '', $events_tmp);
  				}else{
! 					$some_exceptions = '';
  					foreach ($val['exceptions'] as $except_val){
  						$except_tmp	= $loop_except;
***************
*** 268,274 ****
  				foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
  					# ovlKey is a time slot; $ovlValue is an array with key=uid
! 					if ($ovlKey != "-1") {
  						foreach($ovlValue as $ovl2Value) {
! 							$nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value["event_overlap"] + 1));
  						}
  					}
--- 268,274 ----
  				foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
  					# ovlKey is a time slot; $ovlValue is an array with key=uid
! 					if ($ovlKey != '-1') {
  						foreach($ovlValue as $ovl2Value) {
! 							$nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value['event_overlap'] + 1));
  						}
  					}