Permalink
Browse files

Merge with 2.4 branch.

  • Loading branch information...
Jason Oster
Jason Oster committed Jun 15, 2010
1 parent e291cce commit ac58b91d721abf1dc3320c9cabb37ee6f33c3398
Showing with 1 addition and 4 deletions.
  1. +1 −4 functions/parse/recur_functions.php
@@ -45,17 +45,14 @@ function add_recur($times, $freq = '') {
($date <= $until_date)) {
$count--;
if (($time >= $mArray_begin) &&
- ($time <= $mArray_end)
+ ($time <= $mArray_end) &&
($count >= 0)) {
$recur_data[] = $time;
}
}
else if (in_array($date, $except_dates)) {
$count--;
}
- else if (in_array($date, $except_dates)) {
- $count--;
- }
}
#dump_times($recur_data);
return;

0 comments on commit ac58b91

Please sign in to comment.