[limb-svn] r5850 - 3.x/trunk/limb/js/src

svn at limb-project.com svn at limb-project.com
Thu May 10 11:31:09 MSD 2007


Author: tony
Date: 2007-05-10 11:31:09 +0400 (Thu, 10 May 2007)
New Revision: 5850
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5850

Modified:
   3.x/trunk/limb/js/src/lmbJsPreprocessor.class.php
Log:
-- fixed resolving file aliases with wildcards on *nix

Modified: 3.x/trunk/limb/js/src/lmbJsPreprocessor.class.php
===================================================================
--- 3.x/trunk/limb/js/src/lmbJsPreprocessor.class.php	2007-05-10 07:24:34 UTC (rev 5849)
+++ 3.x/trunk/limb/js/src/lmbJsPreprocessor.class.php	2007-05-10 07:31:09 UTC (rev 5850)
@@ -109,20 +109,17 @@
     return isset($this->processed[$file]);
   }
 
-  protected function _getFiles($name)
+  protected function _locateFiles($name)
   {
-    $fullpath = $this->toolkit->findFileAlias($name, LIMB_JS_INCLUDE_PATH, 'js');
-    if(strpos($fullpath, '*') === false)
-      return array($fullpath);
-
-    return glob($fullpath);
+    $locator = $this->toolkit->getFileLocator(LIMB_JS_INCLUDE_PATH, 'js');
+    return $locator->locateAll($name);
   }
 
   protected function _processInclude($filename)
   {
     try
     {
-      $files = $this->_getFiles(trim($filename, " \" '\r "));
+      $files = $this->_locateFiles(trim($filename, " \" '\r "));
     }
     catch(lmbException $e)
     {



More information about the limb-svn mailing list