summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-30 12:42:01 +0100
committerGDmac <grdalenoort@gmail.com>2012-10-30 13:05:53 +0100
commited1741125d638cfaa1bb2918b7f140f282a107de (patch)
tree2b00efddf9b83b18345706b4555a4bad776df9b5 /system/core
parentafca803c1a9212575c9a6454d5a648d1170da91d (diff)
Fix issue #658 (:any wildcard matching slashes)
Diffstat (limited to 'system/core')
-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))