diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-15 22:26:16 +0100 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-15 22:26:16 +0100 |
commit | d98325db8019d7ed71906d63442c694da038fcf7 (patch) | |
tree | ca03aff84e95efc5cf69776c22772f82dd060806 /system/core/Config.php | |
parent | ff1cfa1ae5c5440bfde35c36ecb4cdcd73cd3966 (diff) | |
parent | 17d184dad3a5b28f209e346e53d9956988e0c4a3 (diff) |
Automated merge with https://bitbucket.org/seandowney/codeigniter-reactor
Diffstat (limited to 'system/core/Config.php')
-rw-r--r-- | system/core/Config.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index da22222dc..75f945efd 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -51,7 +51,7 @@ class CI_Config { // Set the base_url automatically if none was provided if ($this->config['base_url'] == '') { - if(isset($_SERVER['HTTP_HOST'])) + if (isset($_SERVER['HTTP_HOST'])) { $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http'; $base_url .= '://'. $_SERVER['HTTP_HOST']; @@ -83,7 +83,7 @@ class CI_Config { $file = ($file == '') ? 'config' : str_replace(EXT, '', $file); $loaded = FALSE; - foreach($this->_config_paths as $path) + foreach ($this->_config_paths as $path) { $file_path = $path.'config/'.ENVIRONMENT.'/'.$file.EXT; |