Commit 73b1cb78 authored by Taylor Otwell's avatar Taylor Otwell

refactored config path checking.

parent a440f0e1
...@@ -136,7 +136,7 @@ class Config { ...@@ -136,7 +136,7 @@ class Config {
foreach (static::paths($module, $file) as $directory) 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; if (count($config) > 0) static::$items[$module][$file] = $config;
...@@ -150,9 +150,9 @@ class Config { ...@@ -150,9 +150,9 @@ class Config {
* The paths returned by this method paths will be searched by the load method when merging * 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. * 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 * By default, the system configuration directory will be searched first, followed by the configuration
* directory for the active module. Next, any environment specific configuration directories * configuration directory for the active module. Next, any environment specific configuration
* will be searched. * directories are searched.
* *
* @param string $module * @param string $module
* @param string $file * @param string $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