phpicalendar-commits

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7471/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.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** recur_functions.php	4 Feb 2010 21:48:14 -0000	1.20
--- recur_functions.php	26 May 2010 15:03:12 -0000	1.21
***************
*** 49,52 ****
--- 49,55 ----
  			) $recur_data[] = $time;
  		}
+ 		else if (in_array($date, $except_dates)) {
+ 			$count--;
+ 		}
  	}
  #dump_times($recur_data);