diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-02 22:19:25 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-02 22:19:25 +0100 |
| commit | d88b31550ae2aeb0e3bcc11ba82d4838f8a5fd31 (patch) | |
| tree | 792bff97d41430b5c36a08c8ec3ac54db97375b6 /system/core/Router.php | |
| parent | 5c59c7dc3254616b18057922ce012f22c18b147b (diff) | |
| parent | 75f5ff5d99533a423e68686d89889d172c37d98e (diff) | |
Merged recent changes and tweaked multi-env changes.
Diffstat (limited to 'system/core/Router.php')
| -rw-r--r-- | 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 79a8b4fcc..6893e6e92 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2010, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -144,7 +144,7 @@ class CI_Router { $this->set_class($x[0]); $this->set_method($x[1]); - $this->_set_request(array($x[0], $x[1])); + $this->_set_request($x); } else { @@ -270,7 +270,7 @@ class CI_Router { // If we've gotten this far it means that the URI does not correlate to a valid // controller class. We will now see if there is an override - if (!empty($this->routes['404_override'])) + if ( ! empty($this->routes['404_override'])) { $x = explode('/', $this->routes['404_override']); |