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

Removing comment bloat from Config class.

This commit is contained in:
Taylor Otwell 2011-08-08 08:47:33 -05:00
parent 9018d6cceb
commit 1091bd8591
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/config.php
View File

@ -38,10 +38,8 @@ public static function get($key, $default = null)
{
list($module, $file, $key) = static::parse($key);
// If the configuration file doesn't exist, return the default value.
if ( ! static::load($module, $file)) return is_callable($default) ? call_user_func($default) : $default;
// If no key was specified, return the entire configuration array.
if (is_null($key)) return static::$items[$module][$file];
return Arr::get(static::$items[$module][$file], $key, $default);
@ -104,10 +102,8 @@ public static function load($module, $file)
$path = ($module === 'application') ? CONFIG_PATH : MODULE_PATH.$module.'/config/';
// Load the base configuration items for the module and file.
$config = (file_exists($base = $path.$file.EXT)) ? require $base : array();
// Merge any enviornment specific configuration items for the module and file.
if (isset($_SERVER['LARAVEL_ENV']) and file_exists($path = $path.$_SERVER['LARAVEL_ENV'].'/'.$file.EXT))
{
$config = array_merge($config, require $path);