summaryrefslogtreecommitdiffstats
path: root/system/core/Router.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-01-27 13:08:38 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-01-27 13:08:38 +0100
commitf00191c02985fba1e360a22ad914c547696df1b2 (patch)
tree76c2d963be0b7c70705369ca4a9f82946df8bba8 /system/core/Router.php
parent5dd84d04294b622f8b85f8aaac54d8329a2ae173 (diff)
parent3bb336cf1c55584bb92ed32563a9543ec7f01574 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'system/core/Router.php')
-rw-r--r--system/core/Router.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index 79a8b4fcc..7be508fef 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
{