From: <par...@us...> - 2010-05-26 14:51:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5458/functions Modified Files: Tag: version-2-4 template.php Log Message: Fix EXDATE in some cases. Thanks to jpommer: http://phpicalendar.net/forums/viewtopic.php?f=45&t=3994#p14555 Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.128 retrieving revision 1.128.2.1 diff -C2 -d -r1.128 -r1.128.2.1 *** template.php 12 May 2010 17:11:13 -0000 1.128 --- template.php 26 May 2010 14:51:27 -0000 1.128.2.1 *************** *** 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)); } } |