diff options
| author | Jason Oster <parasytic@users.sourceforge.net> | 2010-06-15 15:23:16 +0000 |
|---|---|---|
| committer | Jason Oster <parasytic@users.sourceforge.net> | 2010-06-15 15:23:16 +0000 |
| commit | ac58b91d721abf1dc3320c9cabb37ee6f33c3398 (patch) | |
| tree | c49d2ea82e9ddd15284c0829e5af4bfed7f17471 | |
| parent | e291ccea00dfd6640bd106235c167299f398e216 (diff) | |
| download | phpicalendar-ac58b91d721abf1dc3320c9cabb37ee6f33c3398.tar.gz phpicalendar-ac58b91d721abf1dc3320c9cabb37ee6f33c3398.tar.bz2 phpicalendar-ac58b91d721abf1dc3320c9cabb37ee6f33c3398.zip | |
Merge with 2.4 branch.
| -rw-r--r-- | functions/parse/recur_functions.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/functions/parse/recur_functions.php b/functions/parse/recur_functions.php index 7cf8075..82e9568 100644 --- a/functions/parse/recur_functions.php +++ b/functions/parse/recur_functions.php @@ -45,7 +45,7 @@ function add_recur($times, $freq = '') { ($date <= $until_date)) { $count--; if (($time >= $mArray_begin) && - ($time <= $mArray_end) + ($time <= $mArray_end) && ($count >= 0)) { $recur_data[] = $time; } @@ -53,9 +53,6 @@ function add_recur($times, $freq = '') { else if (in_array($date, $except_dates)) { $count--; } - else if (in_array($date, $except_dates)) { - $count--; - } } #dump_times($recur_data); return; |