Browse Source

Remove code that doesn't really need to exist.

It looks like all the removed code was not needed as all existing tests
continue to pass with it removed.
mark_story 12 years ago
parent
commit
9fc56cbab9
1 changed files with 1 additions and 7 deletions
  1. 1 7
      src/Core/Configure.php

+ 1 - 7
src/Core/Configure.php

@@ -252,13 +252,7 @@ class Configure {
 		$values = $engine->read($key);
 
 		if ($merge) {
-			$keys = array_keys($values);
-			foreach ($keys as $key) {
-				$current = Hash::get(static::$_values, $key);
-				if ($current && is_array($values[$key]) && is_array($current)) {
-					$values[$key] = Hash::merge($current, $values[$key]);
-				}
-			}
+			$values = Hash::merge(static::$_values, $values);
 		}
 
 		return static::write($values);