Applying optimization to Controller::postConditions from 'robustsolut…

…ion' Fixes #287
cakephp · Nov 23, 2009 · 5aba143 · 5aba143
1 parent 2e0acbf
commit 5aba143
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
@@ -895,11 +895,12 @@ function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive =
 			$op = '';
 		}
 
+		$arrayOp = is_array($op);
 		foreach ($data as $model => $fields) {
 			foreach ($fields as $field => $value) {
 				$key = $model.'.'.$field;
 				$fieldOp = $op;
-				if (is_array($op)) {
+				if ($arrayOp) {
 					if (array_key_exists($key, $op)) {
 						$fieldOp = $op[$key];
 					} elseif (array_key_exists($field, $op)) {