Fixed issue #1076

bcit-ci · Feb 24, 2012 · 0e2c4df · 0e2c4df
1 parent db60665
commit 0e2c4df
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
@@ -170,13 +170,14 @@
  * ------------------------------------------------------
  */
 	$RTR =& load_class('Router', 'core');
-	$RTR->_set_routing();
-
+
 	// Set any routing overrides that may exist in the main index file
 	if (isset($routing))
 	{
 		$RTR->_set_overrides($routing);
 	}
+
+	$RTR->_set_routing();
 
 /*
  * ------------------------------------------------------

diff --git a/system/core/Router.php b/system/core/Router.php
@@ -269,16 +269,16 @@ function _validate_request($segments)
 		}
 
 		// Does the requested controller exist in the root folder?
-		if (file_exists(APPPATH.'controllers/'.$segments[0].'.php'))
+		if (file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments[0].'.php'))
 		{
 			return $segments;
 		}
 
 		// Is the controller in a sub-folder?
-		if (is_dir(APPPATH.'controllers/'.$segments[0]))
+		if (is_dir(APPPATH.'controllers/'.$this->fetch_directory().$segments[0]))
 		{
 			// Set the directory and remove it from the segment array
-			$this->set_directory($segments[0]);
+			$this->set_directory($this->fetch_directory().$segments[0]);
 			$segments = array_slice($segments, 1);
 
 			if (count($segments) > 0)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
@@ -79,6 +79,7 @@ <h3>Bug fixes for 2.1.1</h3>
 	<li>Fixed a bug - form_open() compared $action against site_url() instead of base_url()</li>
 	<li>Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.</li>
 	<li>Fixed a bug (#538) - Windows paths were ignored when using the <a href="libraries/image_lib.html">Image Manipulation Class</a> to create a new file.</li>
+	<li>Fixed a bug (#1076) - $routing['directory'] wasn't being recognized by CodeIgniter in some cases.</li>
 </ul>