summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-08-14 12:48:59 +0200
committerAndrey Andreev <narf@devilix.net>2015-08-14 12:48:59 +0200
commitff1ba4eb668bb3221b37d39aca2d0958efbb13dc (patch)
treedc6e6619aee9b4855302b3ce1cc3a22d57bba557 /system
parentaf0a0db4960f5735c1dcdd0fd5d8f09b84e71e82 (diff)
parentc2c7cb7e9d869ba8ba8b16a04e5d8300d462d8de (diff)
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system')
-rw-r--r--system/core/Router.php20
1 files changed, 0 insertions, 20 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index 0c793e418..eb868cd5b 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -372,26 +372,6 @@ class CI_Router {
// Get HTTP verb
$http_verb = isset($_SERVER['REQUEST_METHOD']) ? strtolower($_SERVER['REQUEST_METHOD']) : 'cli';
- // Is there a literal match? If so we're done
- if (isset($this->routes[$uri]))
- {
- // Is it an HTTP verb-based route?
- if (is_array($this->routes[$uri]))
- {
- $route = array_change_key_case($this->routes[$uri], CASE_LOWER);
- if (isset($route[$http_verb]))
- {
- $this->_set_request(explode('/', $route[$http_verb]));
- return;
- }
- }
- else
- {
- $this->_set_request(explode('/', $this->routes[$uri]));
- return;
- }
- }
-
// Loop through the route array looking for wildcards
foreach ($this->routes as $key => $val)
{