* Fixed a classpath rebuilding bug that occured on some UNIX platforms due to…

* Fixed a classpath rebuilding bug that occured on some UNIX platforms due to glob() inconsistencies git-svn-id: svn://dwoo.org/dwoo/trunk@15 0598d79b-80c4-4d41-97ba-ac86fbbd088b

* Fixed a classpath rebuilding bug that occured on some UNIX platforms due to…
6d728ce7 · Seldaek · a7e3b93b · 6d728ce7
Commit 6d728ce7 authored Apr 09, 2008 by Seldaek
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

Dwoo.php Dwoo.php +9 -7

No files found.
--- a/Dwoo.php
+++ b/Dwoo.php
@@ -1473,13 +1473,15 @@ class DwooLoader
 		}
 		// iterates over all files/folders
-		foreach(glob($path.DIRECTORY_SEPARATOR.'*') as $f)
+		$list = glob($path.DIRECTORY_SEPARATOR.'*');
-		{
+		if(is_array($list))
-			if(is_dir($f))
+			foreach($list as $f)
-				self::rebuildClassPathCache($f, false);
+			{
-			elseif(basename($f) !== 'classpath.cache')
+				if(is_dir($f))
-				self::$classpath[str_replace(array('function.','block.','modifier.','outputfilter.','filter.','prefilter.','postfilter.','pre.','post.','output.','shared.','helper.'), '', basename($f,'.php'))] = $f;
+					self::rebuildClassPathCache($f, false);
-		}
+				elseif(basename($f) !== 'classpath.cache')
+					self::$classpath[str_replace(array('function.','block.','modifier.','outputfilter.','filter.','prefilter.','postfilter.','pre.','post.','output.','shared.','helper.'), '', basename($f,'.php'))] = $f;
+			}
 		// save in file if it's the first call (not recursed)
 		if($cacheFile!==false)