summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-30 12:42:01 +0100
committerAndrey Andreev <narf@bofh.bg>2012-10-30 12:42:01 +0100
commit7676c2d6761cb3cdeccf005c2a30140f0ba3ced5 (patch)
treeb9af3d1cdf2523bc8e863c2a9b2abd47797a74f0 /system
parent0dfb62ff0ab1d184e20819a066139fea28d68da4 (diff)
Fix issue #658 (:any wildcard matching slashes)
Diffstat (limited to 'system')
-rw-r--r--system/core/Router.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index efee2439f..a5e29f1a3 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -368,7 +368,7 @@ class CI_Router {
foreach ($this->routes as $key => $val)
{
// Convert wild-cards to RegEx
- $key = str_replace(array(':any', ':num'), array('.+', '[0-9]+'), $key);
+ $key = str_replace(array(':any', ':num'), array('[^/]+', '[0-9]+'), $key);
// Does the RegEx match?
if (preg_match('#^'.$key.'$#', $uri))