Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring configuration class.

This commit is contained in:
Taylor Otwell 2011-08-02 10:43:12 -05:00
parent f4fac15e48
commit fc87103205
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system/config.php
View File

@ -45,9 +45,7 @@ public static function get($key, $default = null)
list($file, $key) = static::parse($key); list($file, $key) = static::parse($key);
static::load($file); if ( ! static::load($file))
if ( ! array_key_exists($file, static::$items))
{ {
return is_callable($default) ? call_user_func($default) : $default; return is_callable($default) ? call_user_func($default) : $default;
} }
@ -99,11 +97,11 @@ private static function parse($key)
* Any environment specific configuration files will be merged with the root file. * Any environment specific configuration files will be merged with the root file.
* *
* @param string $file * @param string $file
* @return void * @return bool
*/ */
public static function load($file) public static function load($file)
{ {
if (array_key_exists($file, static::$items)) return; if (array_key_exists($file, static::$items)) return true;
$config = (file_exists($path = CONFIG_PATH.$file.EXT)) ? require $path : array(); $config = (file_exists($path = CONFIG_PATH.$file.EXT)) ? require $path : array();
@ -112,10 +110,7 @@ public static function load($file)
$config = array_merge($config, require $path); $config = array_merge($config, require $path);
} }
if (count($config) > 0) return (count(static::$items[$file] = $config) > 0);
{
static::$items[$file] = $config;
}
} }
} }