aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Oster <parasytic@users.sourceforge.net>2010-05-26 15:03:12 +0000
committerJason Oster <parasytic@users.sourceforge.net>2010-05-26 15:03:12 +0000
commit62ceba3018274adb8b86e5d8c1d14749a1537d0a (patch)
treed73e953974b9e1865e571c6b65afeab5ff33ffc1
parent1c7eaa2b23e9d523ae8d346556af240b3c38efea (diff)
downloadphpicalendar-62ceba3018274adb8b86e5d8c1d14749a1537d0a.zip
phpicalendar-62ceba3018274adb8b86e5d8c1d14749a1537d0a.tar.gz
phpicalendar-62ceba3018274adb8b86e5d8c1d14749a1537d0a.tar.bz2
Merge with 2.4 branch
-rw-r--r--functions/parse/recur_functions.php3
-rw-r--r--functions/template.php6
2 files changed, 6 insertions, 3 deletions
diff --git a/functions/parse/recur_functions.php b/functions/parse/recur_functions.php
index ceab4e4..76cb30b 100644
--- a/functions/parse/recur_functions.php
+++ b/functions/parse/recur_functions.php
@@ -48,6 +48,9 @@ function add_recur($times,$freq=''){
&& $count >= 0
) $recur_data[] = $time;
}
+ else if (in_array($date, $except_dates)) {
+ $count--;
+ }
}
#dump_times($recur_data);
return;
diff --git a/functions/template.php b/functions/template.php
index 002cf15..95ebabf 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -186,7 +186,7 @@ class Page {
if (!isset($val['exceptions'])) {
$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', '', $events_tmp);
}else{
- $some_exceptions = "";
+ $some_exceptions = '';
foreach ($val['exceptions'] as $except_val){
$except_tmp = $loop_except;
@@ -267,9 +267,9 @@ class Page {
if (isset($master_array[$thisday])) {
foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
# ovlKey is a time slot; $ovlValue is an array with key=uid
- if ($ovlKey != "-1") {
+ if ($ovlKey != '-1') {
foreach($ovlValue as $ovl2Value) {
- $nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value["event_overlap"] + 1));
+ $nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value['event_overlap'] + 1));
}
}
}

© 2014-2020 Faster IT GmbH | imprint | privacy policy