Skip to content

Commit

Permalink
test failed. reverted and corrected doc block instead for BC.
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark committed May 7, 2014
1 parent 1caf1ca commit 8f0e203
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/Cake/Core/Configure.php
Expand Up @@ -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) {
Expand All @@ -306,7 +306,7 @@ public static function load($key, $config = 'default', $merge = true) {
}
}

self::write($values);
return self::write($values);
}

/**
Expand Down Expand Up @@ -424,6 +424,7 @@ public static function clear() {
self::$_values = array();
return true;
}

/**
* Set the error and exception handlers.
*
Expand All @@ -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.