diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-02 12:40:46 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-02 12:40:46 +0200 |
commit | 81aa94bbb533737c19a705d5b8864bd47fbab85c (patch) | |
tree | 3c6eb0979804013c4b134614bccad4a9b385839a /system/core/Router.php | |
parent | 3110a0a3cc6b25985acc251799ca9cc97f92ce03 (diff) |
Reverted rui_string change.
This had knock-on effects as can be seen in #1306. Issue #122 has been
reopend until it is fixed properly.
Diffstat (limited to 'system/core/Router.php')
-rwxr-xr-x | system/core/Router.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/system/core/Router.php b/system/core/Router.php index fe9909b06..9314052fe 100755 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -242,12 +242,9 @@ class CI_Router { $segments[1] = 'index'; } - // This is being routed to a file in a sub directory - $this->directory and array_unshift($segments, trim($this->directory, '/')); - // Update our "routed" segment array to contain the segments. // Note: If there is no custom routing, this array will be - // identical to $this->uri->segments + // identical to $this->uri->segments $this->uri->rsegments = $segments; } |