Merge with 2.4 branch

Author: Jason Oster

functions/parse/recur_functions.php

@@ -48,6 +48,9 @@ function add_recur($times,$freq=''){
 				&& $count >= 0
 			) $recur_data[] = $time;
 		}
+		else if (in_array($date, $except_dates)) {
+			$count--;
+		}
 	}
 #dump_times($recur_data);
 	return;

functions/template.php

@@ -186,7 +186,7 @@ function draw_search($template_p) {
 					if (!isset($val['exceptions'])) {
 					$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', '', $events_tmp);
 				}else{
-					$some_exceptions = "";
+					$some_exceptions = '';
 					foreach ($val['exceptions'] as $except_val){
 						$except_tmp	= $loop_except;
 
@@ -267,9 +267,9 @@ function draw_week($template_p) {
 			if (isset($master_array[$thisday])) {
 				foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
 					# ovlKey is a time slot; $ovlValue is an array with key=uid
-					if ($ovlKey != "-1") {
+					if ($ovlKey != '-1') {
 						foreach($ovlValue as $ovl2Value) {
-							$nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value["event_overlap"] + 1));
+							$nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value['event_overlap'] + 1));
 						}
 					}
 				}