From 26bde91ef36cacd22772102d3083277bd937a60d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 3 Oct 2008 02:29:56 +0000 Subject: When I fixed a bug that did not permit the default route to be in a sub-folder, I introducted a different bug (#5285), which this should fix --- system/libraries/Router.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'system') diff --git a/system/libraries/Router.php b/system/libraries/Router.php index f1923794e..cf425163d 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -98,7 +98,22 @@ class CI_Router { show_error("Unable to determine what should be displayed. A default route has not been specified in the routing file."); } - $this->uri->uri_string = $this->default_controller; + // Turn the default route into an array. We explode it in the event that + // the controller is located in a subfolder + $segments = $this->_validate_request(explode('/', $this->default_controller)); + + // Set the class and method + $this->set_class($segments[0]); + $this->set_method('index'); + + // Assign the segments to the URI class + $this->uri->rsegments = $segments; + + // re-index the routed segments array so it starts with 1 rather than 0 + $this->uri->_reindex_segments(); + + log_message('debug', "No URI present. Default controller set."); + return; } unset($this->routes['default_controller']); -- cgit v1.2.3-24-g4f1b