summaryrefslogtreecommitdiffstats
path: root/system/core/Router.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:13:31 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:13:31 +0200
commitcdfbd5281e4dec7278a07943832c2590c1141eb3 (patch)
tree207cbf75e1783db8c6d05ab2ab1f179fce56efc8 /system/core/Router.php
parent1991379f11af083675b60979c5d9f2a9bba213a4 (diff)
Fixed issue #122 - ruri_string() in subdirs.
Diffstat (limited to 'system/core/Router.php')
-rwxr-xr-xsystem/core/Router.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index 5477fed5d..fa88cb3dc 100755
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -237,9 +237,12 @@ 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;
}