Merge with 2.4 branch.

Jason Oster · Jason Oster · commit ac58b91d721a · 2010-06-15T15:23:16.000Z
diff --git a/functions/parse/recur_functions.php b/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;

Original file line number	Diff line number	Diff line change
`@@ -45,17 +45,14 @@ function add_recur($times, $freq = '') {`
`45`	`45`	`($date <= $until_date)) {`
`46`	`46`	`$count--;`
`47`	`47`	`if (($time >= $mArray_begin) &&`
`48`		`- ($time <= $mArray_end)`
	`48`	`+ ($time <= $mArray_end) &&`
`49`	`49`	`($count >= 0)) {`
`50`	`50`	`$recur_data[] = $time;`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`else if (in_array($date, $except_dates)) {`
`54`	`54`	`$count--;`
`55`	`55`	`}`
`56`		`- else if (in_array($date, $except_dates)) {`
`57`		`- $count--;`
`58`		`- }`
`59`	`56`	`}`
`60`	`57`	`#dump_times($recur_data);`
`61`	`58`	`return;`