From 73b1cb78f410306b1eb81185a80753a051ec5926 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 18 Aug 2011 23:57:14 -0500 Subject: [PATCH] refactored config path checking. --- laravel/config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/laravel/config.php b/laravel/config.php index 853b1284..2f49ccf9 100644 --- a/laravel/config.php +++ b/laravel/config.php @@ -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