From ac58b91d721abf1dc3320c9cabb37ee6f33c3398 Mon Sep 17 00:00:00 2001
From: Jason Oster <parasytic@users.sourceforge.net>
Date: Tue, 15 Jun 2010 15:23:16 +0000
Subject: Merge with 2.4 branch.

---
 functions/parse/recur_functions.php | 5 +----
 1 file changed, 1 insertion(+), 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;
-- 
cgit v1.2.3