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

refactored config path checking.

This commit is contained in:
Taylor Otwell 2011-08-18 23:57:14 -05:00
parent a440f0e185
commit 73b1cb78f4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
laravel/config.php
View File

@ -136,7 +136,7 @@ private static function load($module, $file)
foreach (static::paths($module, $file) as $directory)
{
$config = (file_exists($path = $directory.$file.EXT)) ? array_merge($config, require $path) : $config;
if (file_exists($path = $directory.$file.EXT)) $config = array_merge($config, require $path);
}
if (count($config) > 0) static::$items[$module][$file] = $config;
@ -150,9 +150,9 @@ private static function load($module, $file)
* The paths returned by this method paths will be searched by the load method when merging
* configuration files, meaning the configuration files will cascade in this order.
*
* By default, the base configuration directory will be searched first, followed by the configuration
* directory for the active module. Next, any environment specific configuration directories
* will be searched.
* By default, the system configuration directory will be searched first, followed by the configuration
* configuration directory for the active module. Next, any environment specific configuration
* directories are searched.
*
* @param string $module
* @param string $file