[PHPiCalendar-Commits] phpicalendar/functions/parse recur_functions.php, 1.22, 1.23

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8391/functions/parse

Modified Files:
	recur_functions.php 
Log Message:
Merge with 2.4 branch.

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** recur_functions.php	27 May 2010 15:47:24 -0000	1.22
--- recur_functions.php	15 Jun 2010 15:23:16 -0000	1.23
***************
*** 46,50 ****
  			$count--;
  			if (($time >= $mArray_begin) &&
! 				($time <= $mArray_end)
  				($count >= 0)) {
  				$recur_data[] = $time;
--- 46,50 ----
  			$count--;
  			if (($time >= $mArray_begin) &&
! 				($time <= $mArray_end) &&
  				($count >= 0)) {
  				$recur_data[] = $time;
***************
*** 54,60 ****
  			$count--;
  		}
- 		else if (in_array($date, $except_dates)) {
- 			$count--;
- 		}
  	}
  #dump_times($recur_data);
--- 54,57 ----