Commit 26ff78da authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'develop' of github.com:taylorotwell/laravel into develop

parents f044b429 78037082
...@@ -17,8 +17,19 @@ class Config { ...@@ -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]))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment