Skip to content
Permalink
Browse files

test failed. reverted and corrected doc block instead for BC.

  • Loading branch information...
dereuromark committed May 7, 2014
1 parent 1caf1ca commit 8f0e203fb5e39c26bc8d0a71cdc383f6ac923bee
Showing with 4 additions and 2 deletions.
  1. +4 −2 lib/Cake/Core/Configure.php
@@ -287,7 +287,7 @@ public static function drop($name) {
* @param string $key name of configuration resource to load.
* @param string $config Name of the configured reader to use to read the resource identified by $key.
* @param boolean $merge if config files should be merged instead of simply overridden
* @return mixed false if file not found, void if load successful.
* @return boolean False if file not found, true if load successful.
* @throws ConfigureException Will throw any exceptions the reader raises.
*/
public static function load($key, $config = 'default', $merge = true) {
@@ -306,7 +306,7 @@ public static function load($key, $config = 'default', $merge = true) {
}
}
self::write($values);
return self::write($values);
}
/**
@@ -424,6 +424,7 @@ public static function clear() {
self::$_values = array();
return true;
}
/**
* Set the error and exception handlers.
*
@@ -444,4 +445,5 @@ protected static function _setErrorHandlers($error, $exception) {
set_exception_handler($exception['handler']);
}
}
}

0 comments on commit 8f0e203

Please sign in to comment.
You can’t perform that action at this time.