svn commit: r659035 - /incubator/shindig/trunk/php/src/gadgets/JsFeatureLoader.php

[chabotc]

Author: chabotc
Date: Thu May 22 01:01:11 2008
New Revision: 659035

URL: http://svn.apache.org/viewvc?rev=659035&view=rev
Log:
the glob */feature.xml broke the directory sorting, which broke the dependency 
chain and so pretty much everything else.

Modified:
    incubator/shindig/trunk/php/src/gadgets/JsFeatureLoader.php

Modified: incubator/shindig/trunk/php/src/gadgets/JsFeatureLoader.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/JsFeatureLoader.php?rev=659035&r1=659034&r2=659035&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/JsFeatureLoader.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/JsFeatureLoader.php Thu May 22 
01:01:11 2008
@@ -39,11 +39,13 @@
 
        private function loadFiles($path, &$features)
        {
-               foreach (glob("$path/*/feature.xml") as $file) {
-                       $file = realpath($file);
-                       $feature = $this->processFile($file);
-                       if ($feature != null) {
-                               $features[$feature->name] = $feature;
+               foreach (glob("$path/*") as $file) {
+                       $file = realpath($file.'/feature.xml');
+                       if (file_exists($file) && is_readable($file)) {
+                               $feature = $this->processFile($file);
+                               if ($feature != null) {
+                                       $features[$feature->name] = $feature;
+                               }
                        }
                }
                return $features;