From 695a8848ed112233900ecc0d5756752c22c47ecd Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 15 Aug 2011 20:13:48 -0500 Subject: [PATCH] added comment back to configuration class. --- system/config.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/config.php b/system/config.php index f61b8628..a30cfd82 100644 --- a/system/config.php +++ b/system/config.php @@ -106,6 +106,9 @@ class Config { $path = ($module === 'application') ? CONFIG_PATH : MODULE_PATH.$module.'/config/'; + // Load the base configuration file. Once that is loaded, we will merge any environment + // specific configuration options into the base array. This allows for the convenient + // cascading of configuration options depending on the application environment. $config = (file_exists($base = $path.$file.EXT)) ? require $base : array(); if (isset($_SERVER['LARAVEL_ENV']) and file_exists($path = $path.$_SERVER['LARAVEL_ENV'].'/'.$file.EXT))