diff options
| author | Melounek <petr@heralecky.cz> | 2012-10-05 15:50:00 +0200 |
|---|---|---|
| committer | Melounek <petr@heralecky.cz> | 2012-10-05 15:50:00 +0200 |
| commit | cc7c7c691ad16beb5040a8a1d07064e61b5e2167 (patch) | |
| tree | f0ed98dc9f580bf38cfb13b72d8ab2cddfd69a3f /system/core/Config.php | |
| parent | 58dfc089bf5b0ca35c2ff244e5bfdff726f9adcd (diff) | |
| parent | 6123b61e8ec95ac91f67bfbf442e34021c922319 (diff) | |
update devel version
Diffstat (limited to 'system/core/Config.php')
| -rw-r--r-- | system/core/Config.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index 4b4e5a7ba..8e4f998ef 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -43,7 +43,7 @@ class CI_Config { * * @var array */ - public $config = array(); + public $config = array(); /** * List of all loaded config files @@ -103,12 +103,12 @@ class CI_Config { $file = ($file === '') ? 'config' : str_replace('.php', '', $file); $found = $loaded = FALSE; + $check_locations = defined('ENVIRONMENT') + ? array(ENVIRONMENT.'/'.$file, $file) + : array($file); + foreach ($this->_config_paths as $path) { - $check_locations = defined('ENVIRONMENT') - ? array(ENVIRONMENT.'/'.$file, $file) - : array($file); - foreach ($check_locations as $location) { $file_path = $path.'config/'.$location.'.php'; @@ -172,7 +172,7 @@ class CI_Config { { return FALSE; } - show_error('The configuration file '.$file.'.php'.' does not exist.'); + show_error('The configuration file '.$file.'.php does not exist.'); } return TRUE; @@ -271,7 +271,7 @@ class CI_Config { */ public function base_url($uri = '') { - return $this->slash_item('base_url').ltrim($this->_uri_string($uri),'/'); + return $this->slash_item('base_url').ltrim($this->_uri_string($uri), '/'); } // ------------------------------------------------------------- |