diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-03 17:36:45 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-03 17:36:45 +0200 |
commit | 142b618fb7419972288a8f7b58e7e2509b3bf225 (patch) | |
tree | 53566bfe94a12e7fb2e28ec4122dfa6732f25a64 /system/core/Router.php | |
parent | dda21f6abc76451997b12c07e6066aa49c2d423d (diff) | |
parent | 0c5180bcfc996f32176f28895e9bd75be582c4fa (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Router.php')
-rwxr-xr-x | system/core/Router.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/core/Router.php b/system/core/Router.php index 5ea13797b..93875bdd9 100755 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -165,7 +165,7 @@ class CI_Router { $this->uri->_fetch_uri_string(); // Is there a URI string? If not, the default controller specified in the "routes" file will be shown. - if ($this->uri->uri_string == '') + if ($this->uri->uri_string === '') { return $this->_set_default_controller(); } @@ -435,7 +435,7 @@ class CI_Router { */ public function fetch_method() { - return ($this->method == $this->fetch_class()) ? 'index' : $this->method; + return ($this->method === $this->fetch_class()) ? 'index' : $this->method; } // -------------------------------------------------------------------- @@ -483,14 +483,14 @@ class CI_Router { $this->set_directory($routing['directory']); } - if (isset($routing['controller']) && $routing['controller'] != '') + if (isset($routing['controller']) && $routing['controller'] !== '') { $this->set_class($routing['controller']); } if (isset($routing['function'])) { - $routing['function'] = ($routing['function'] == '') ? 'index' : $routing['function']; + $routing['function'] = ($routing['function'] === '') ? 'index' : $routing['function']; $this->set_method($routing['function']); } } |