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

Merge pull request #11 from mikelbring/develop 

Load a config file with out a key
This commit is contained in:
Taylor Otwell 2011-06-16 18:44:05 -07:00
parent 825ac35a47 2b659dfae9
commit 780370826a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system/config.php
View File

@ -17,8 +17,19 @@ class Config {
*/ */
public static function get($key) public static function get($key)
{ {
list($file, $key) = static::parse($key);
// -----------------------------------------------------
// We are are just pulling in a file, skip loading a key
// -----------------------------------------------------
if(strpos($key, '.') == 0)
{
static::load($key);
return static::$items[$key];
}
list($file, $key) = static::parse($key);
static::load($file); static::load($file);
if (array_key_exists($key, static::$items[$file])) if (array_key_exists($key, static::$items[$file]))