diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-06-04 13:44:34 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-06-04 13:44:34 +0200 |
commit | 9ba661b02c492e89028e5c67b7edbfc0efefc9f1 (patch) | |
tree | d3c3250b2c19b6d009c3fd3fe580b7021ed18a23 /system/core/Router.php | |
parent | 142b618fb7419972288a8f7b58e7e2509b3bf225 (diff) |
Revert/optimize some changes from ed944a3c70a0bad158cd5a6ca5ce1f2e717aff5d
Diffstat (limited to 'system/core/Router.php')
-rwxr-xr-x | system/core/Router.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Router.php b/system/core/Router.php index 93875bdd9..5bc053045 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(); } @@ -483,14 +483,14 @@ class CI_Router { $this->set_directory($routing['directory']); } - if (isset($routing['controller']) && $routing['controller'] !== '') + if ( ! empty($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']); } } |