diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
commit | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (patch) | |
tree | eb2adb1cf4f1dea1e4d14c69a3f1a275b14cff08 /system/core/Config.php | |
parent | fd2ceab417bbb696134910ce0eaeca34bea3e1e5 (diff) | |
parent | fc11dcc82cefa7299e6f8c74d0e005ebb6fa568c (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/core/Config.php')
-rwxr-xr-x | system/core/Config.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index c07ffa591..3de1bcb96 100755 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -100,7 +100,7 @@ class CI_Config { */ public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) { - $file = ($file == '') ? 'config' : str_replace('.php', '', $file); + $file = ($file === '') ? 'config' : str_replace('.php', '', $file); $found = $loaded = FALSE; foreach ($this->_config_paths as $path) @@ -211,7 +211,7 @@ class CI_Config { { return FALSE; } - elseif (trim($this->config[$item]) == '') + elseif (trim($this->config[$item]) === '') { return ''; } @@ -230,14 +230,14 @@ class CI_Config { */ public function site_url($uri = '') { - if ($uri == '') + if ($uri === '') { return $this->slash_item('base_url').$this->item('index_page'); } - if ($this->item('enable_query_strings') == FALSE) + if ($this->item('enable_query_strings') === FALSE) { - $suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix'); + $suffix = ($this->item('url_suffix') === FALSE) ? '' : $this->item('url_suffix'); return $this->slash_item('base_url').$this->slash_item('index_page').$this->_uri_string($uri).$suffix; } else @@ -270,7 +270,7 @@ class CI_Config { */ protected function _uri_string($uri) { - if ($this->item('enable_query_strings') == FALSE) + if ($this->item('enable_query_strings') === FALSE) { if (is_array($uri)) { |