adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
euromark 2014-05-08 01:52:48 +02:00
parent 1caf1cac4b
commit 8f0e203fb5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Core/Configure.php
View file

@ -287,7 +287,7 @@ class Configure {
* @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 @@ class Configure {
}
}
self::write($values);
return self::write($values);
}
/**
@ -424,6 +424,7 @@ class Configure {
self::$_values = array();
return true;
}
/**
* Set the error and exception handlers.
*
@ -444,4 +445,5 @@ class Configure {
set_exception_handler($exception['handler']);
}
}
}