summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-08-14 12:48:31 +0200
committerAndrey Andreev <narf@devilix.net>2015-08-14 12:48:31 +0200
commitc2c7cb7e9d869ba8ba8b16a04e5d8300d462d8de (patch)
tree8140d9ed939b4c1e2927701b80d276b266479a44 /system/core
parent62fe0117ae087ccfb5fd94cc9f83977c86f2452f (diff)
Fix #4052
The bug actually had two instances: - Callback routes with literal matches and HTTP verbs has never worked - The reported issue in #4052, which is a regression introduced in 3.0.1 with abc299b3a234eb7da1b7e3d257b7eba2da649219 Removed the literal matches logic altogether to avoid similar issues in the future and reduce code complexity. The same logic is performed with the regular expressions logic.
Diffstat (limited to 'system/core')
-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)
{