summaryrefslogtreecommitdiffstats
path: root/system/core/Router.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-08-06 16:00:30 +0200
committerAndrey Andreev <narf@devilix.net>2013-08-06 16:00:30 +0200
commit5a215b6064c9ce7ee33db9a76bcb1a62bea16ec3 (patch)
treef1ca126a98fddf103dec6d544536d6d240d32ffc /system/core/Router.php
parent5b55c15f24b518aa4775a0c15382c7b4bf72e1bc (diff)
parent40d124924ea331c6a57ab1b3f743299a41eb3f0c (diff)
Merge pull request #2586 from vlakoff/develop
Various typos and tabs adjustments
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 989ae542e..0f7278ae6 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -351,10 +351,10 @@ class CI_Router {
return $this->_set_request(explode('/', $this->routes[$uri]));
}
- // Loop through the route array looking for wild-cards
+ // Loop through the route array looking for wildcards
foreach ($this->routes as $key => $val)
{
- // Convert wild-cards to RegEx
+ // Convert wildcards to RegEx
$key = str_replace(array(':any', ':num'), array('[^/]+', '[0-9]+'), $key);
// Does the RegEx match?