Minor simplification.

cakephp · Aug 25, 2013 · f655e8a · f655e8a
1 parent 074fced
commit f655e8a
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php
@@ -250,12 +250,11 @@ public static function insert(array $data, $path, $values = null) {
 
 		foreach ($data as $k => $v) {
 			if (self::_matchToken($k, $token)) {
-				if ($conditions) {
-					if (self::_matches($v, $conditions)) {
-						$data[$k] = array_merge($v, $values);
-						continue;
-					}
-				} else {
+				if ($conditions && self::_matches($v, $conditions)) {
+					$data[$k] = array_merge($v, $values);
+					continue;
+				}
+				if (!$conditions) {
 					$data[$k] = self::insert($v, $nextPath, $values);
 				}
 			}