summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-12-15 16:53:35 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-12-15 16:53:35 +0100
commit790ebf3a77677dd6d7473bb14f8e9c5594ddcb46 (patch)
treeebde73fd425de556db663d9a0defe721613f7bb5
parent6c1d3fa35198c54c69e37aa74fa80723209c1d1e (diff)
Changing the router to support any number of segments in the default route. Closes #261.
-rw-r--r--system/core/Router.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index 9276800c3..e21519329 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -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
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index c3693e5f9..80d830d9d 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -160,6 +160,7 @@ Hg Tag: </p>
<li>Documented <kbd>append_output()</kbd> in the <a href="libraries/output.html">Output Class</a>.</li>
<li>Documented a second argument in the <kbd>decode()</kbd> function for the <a href="libraries/encryption.html">Encryption Class</a>.</li>
<li>Documented db->close().</li>
+ <li>Updated the router to support a default route with any number of segments.</li>
<li>Moved _remove_invisible_characters() function from the <a href="libraries/security.html">Security Library</a> to <a href="general/common_functions.html">common functions.</a></li>
</ul>
</li>