diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-08-14 12:48:59 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-08-14 12:48:59 +0200 |
| commit | ff1ba4eb668bb3221b37d39aca2d0958efbb13dc (patch) | |
| tree | dc6e6619aee9b4855302b3ce1cc3a22d57bba557 | |
| parent | af0a0db4960f5735c1dcdd0fd5d8f09b84e71e82 (diff) | |
| parent | c2c7cb7e9d869ba8ba8b16a04e5d8300d462d8de (diff) | |
Merge branch '3.0-stable' into develop
| -rw-r--r-- | system/core/Router.php | 20 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 1 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) { diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 059c5e161..64120df8e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -21,6 +21,7 @@ Bug fixes for 3.0.2 ------------------- - Fixed a bug (#2284) - :doc:`Database <database/index>` method ``protect_identifiers()`` breaks when :doc:`Query Builder <database/query_builder>` isn't enabled. +- Fixed a bug (#4052) - :doc:`Routing <general/routing>` with anonymous functions didn't work for routes that don't use regular expressions. Version 3.0.1 ============= |