reverted previous changes to Fuel::find_file(), and only add the mult…

…iple/single cache identifier at the end
fuel · May 10, 2011 · e14bc5a · e14bc5a
1 parent 0f43453
commit e14bc5a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/classes/fuel.php b/classes/fuel.php
@@ -229,7 +229,7 @@ public static function finish()
 	 */
 	public static function find_file($directory, $file, $ext = '.php', $multiple = false, $cache = true)
 	{
-		$cache_id = $multiple ? 'M.' : 'S.';
+		$cache_id = '';
 		$paths = array();
 
 		$found = $multiple ? array() : false;
@@ -258,7 +258,7 @@ public static function find_file($directory, $file, $ext = '.php', $multiple = f
 		}
 
 		// if not found, use the cascading filesystem to find the file
-		if (empty($paths))
+		if (empty($cache_id))
 		{
 			$paths = static::$_paths;
 
@@ -272,7 +272,7 @@ public static function find_file($directory, $file, $ext = '.php', $multiple = f
 
 		$path = $directory.DS.strtolower($file).$ext;
 
-		$cache_id = md5($cache_id);
+		$cache_id = md5(($multiple ? 'M.' : 'S.').$cache_id);
 
 		if (static::$path_cache !== null and array_key_exists($cache_id.$path, static::$path_cache))
 		{