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

1 files changed, 8 insertions, 3 deletions

diff --git a/tests/mocks/autoloader.php b/tests/mocks/autoloader.php
index e3ff7a8bd..be1c2220c 100644
--- a/tests/mocks/autoloader.php
+++ b/tests/mocks/autoloader.php
@@ -69,16 +69,21 @@ function autoload($class)
 		}
 	}
 
-	$file = isset($file) ? $file : $dir.$class.'.php';
+	$file = (isset($file)) ? $file : $dir.$class.'.php';
 
 	if ( ! file_exists($file))
 	{
 		$trace = debug_backtrace();
 
-		// If the autoload call came from `class_exists` or `file_exists`,
-		// we skipped and return FALSE
 		if ($trace[2]['function'] === 'class_exists' OR $trace[2]['function'] === 'file_exists')
 		{
+			// If the autoload call came from `class_exists` or `file_exists`,
+			// we skipped and return FALSE
+			return FALSE;
+		}
+		elseif (($autoloader = spl_autoload_functions()) && end($autoloader) !== __FUNCTION__)
+		{
+			// If there was other custom autoloader, passed away
 			return FALSE;
 		}