Little optimization in postConditions of controller.

Signed-off-by: Mark Story <mark@mark-story.com>
cakephp · Nov 21, 2009 · 1cef0ac · 1cef0ac
1 parent 1c0c1bc
commit 1cef0ac
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
@@ -899,12 +899,14 @@ function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive =
 			foreach ($fields as $field => $value) {
 				$key = $model.'.'.$field;
 				$fieldOp = $op;
-				if (is_array($op) && array_key_exists($key, $op)) {
-					$fieldOp = $op[$key];
-				} elseif (is_array($op) && array_key_exists($field, $op)) {
-					$fieldOp = $op[$field];
-				} elseif (is_array($op)) {
-					$fieldOp = false;
+				if (is_array($op)) {
+					if (array_key_exists($key, $op)) {
+						$fieldOp = $op[$key];
+					} elseif (array_key_exists($field, $op)) {
+						$fieldOp = $op[$field];
+					} else {
+						$fieldOp = false;
+					}
 				}
 				if ($exclusive && $fieldOp === false) {
 					continue;