Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch

1 files changed, 4 insertions, 1 deletions

diff --git a/system/core/Router.php b/system/core/Router.php
index 9314052fe..fe9909b06 100755
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -242,9 +242,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;
 	}