fixed array_merge() error in Finder::list_files() if an error occurs …

…in glob()
fuel · Apr 3, 2012 · 0959c5f · 0959c5f
1 parent 21e869b
commit 0959c5f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/classes/finder.php b/classes/finder.php
@@ -257,7 +257,10 @@ public function list_files($directory = null, $filter = '*.php')
 		$found = array();
 		foreach ($paths as $path)
 		{
-			$found = array_merge(glob($path.$directory.'/'.$filter), $found);
+			if (($f = glob($path.$directory.DS.$filter)) !== false)
+			{
+				$found = array_merge($f, $found);
+			}
 		}
 
 		return $found;