diff options
| -rw-r--r-- | system/libraries/Router.php | 8 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/system/libraries/Router.php b/system/libraries/Router.php index fd0ffa22a..d24192c18 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -158,6 +158,12 @@ class CI_Router { $this->set_method($segments[1]);
}
}
+ else
+ {
+ // This lets the "routed" segment array identify that the default
+ // index method is being used.
+ $segments[1] = 'index';
+ }
// Update our "routed" segment array to contain the segments.
// Note: If there is no custom routing, this array will be
@@ -271,7 +277,7 @@ class CI_Router { return;
}
}
-
+
// If we got this far it means we didn't encounter a
// matching route so we'll set the site default route
$this->_set_request($this->uri->segments);
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 200b4c0e7..1affd9dba 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -161,6 +161,7 @@ Change Log <h3>Bug fixes for Version 1.6.0</h3>
<ul>
+ <li>Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.</li>
<li>Fixed a bug (#1872) where word_limiter() was not retaining whitespace.</li>
<li>Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.</li>
<li>Fixed a bug (#2542)in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.</li>
|