Skip to content

Commit

Permalink
Remove code that doesn't really need to exist.
Browse files Browse the repository at this point in the history
It looks like all the removed code was not needed as all existing tests
continue to pass with it removed.
  • Loading branch information
markstory committed May 16, 2014
1 parent 3d96505 commit 9fc56cb
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/Core/Configure.php
Expand Up @@ -252,13 +252,7 @@ public static function load($key, $config = 'default', $merge = true) {
$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);
Expand Down

0 comments on commit 9fc56cb

Please sign in to comment.