[limb-svn] r7042 - 3.x/trunk/limb/macro/src/compiler

[svn at limb-project.com]

Author: korchasa
Date: 2008-05-23 18:18:18 +0400 (Fri, 23 May 2008)
New Revision: 7042
URL: http://fisheye.limb-project.com/changelog/limb/?cs=7042

Modified:
   3.x/trunk/limb/macro/src/compiler/lmbMacroFilterDictionary.class.php
   3.x/trunk/limb/macro/src/compiler/lmbMacroTagDictionary.class.php
Log:
-- compatibility with PHP 5.1.6 fixes

Modified: 3.x/trunk/limb/macro/src/compiler/lmbMacroFilterDictionary.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/compiler/lmbMacroFilterDictionary.class.php	2008-05-23 11:33:25 UTC (rev 7041)
+++ 3.x/trunk/limb/macro/src/compiler/lmbMacroFilterDictionary.class.php	2008-05-23 14:18:18 UTC (rev 7042)
@@ -38,7 +38,10 @@
     if(!$config['is_force_scan'] && $this->_loadCache())
       return;
 
-    foreach($config['filters_scan_dirs'] as $dir)
+    //compatibility with PHP 5.1.6
+    $filters_scan_dirs = $config['filters_scan_dirs'];
+
+    foreach($filters_scan_dirs as $dir)
     {
       foreach(lmb_glob($dir . '/*.filter.php') as $file)
         $this->registerFromFile($file);
@@ -71,19 +74,19 @@
   function register($filter_info)
   {
     $names = array(strtolower($filter_info->getName()));
-    
+
     $aliases = $filter_info->getAliases();
     if(count($aliases))
     {
       $aliases = array_map('strtolower', $aliases);
       $names = array_merge($names, $aliases);
     }
-    
+
     foreach($names as $filter_name)
     {
       if(isset($this->info[$filter_name]))
         return;
-  
+
       $this->info[$filter_name] = $filter_info;
     }
   }

Modified: 3.x/trunk/limb/macro/src/compiler/lmbMacroTagDictionary.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/compiler/lmbMacroTagDictionary.class.php	2008-05-23 11:33:25 UTC (rev 7041)
+++ 3.x/trunk/limb/macro/src/compiler/lmbMacroTagDictionary.class.php	2008-05-23 14:18:18 UTC (rev 7042)
@@ -32,15 +32,19 @@
   {
     if(!isset($config['cache_dir']) || !$config['cache_dir']
       || !isset($config['is_force_scan'])
-      || !isset($config['tags_scan_dirs']) || !$config['tags_scan_dirs'])      
+      || !isset($config['tags_scan_dirs']) || !$config['tags_scan_dirs'])
       throw new lmbMacroException('Wrong Config object data', $config);
 
-    $this->cache_dir = $config['cache_dir']; 
+    $this->cache_dir = $config['cache_dir'];
     if(!$config['is_force_scan'] && $this->_loadCache())
       return;
-      
-    $real_scan_dirs = array();    
-    foreach($config['tags_scan_dirs'] as $dir)
+
+    $real_scan_dirs = array();
+
+    //compatibility with PHP 5.1.6
+    $tag_scan_dirs = $config['tags_scan_dirs'];
+
+    foreach($tag_scan_dirs as $dir)
     {
       foreach($this->_getThisAndImmediateDirectories($dir) as $item)
         $real_scan_dirs[] = $item;
@@ -65,7 +69,7 @@
     $dirs[] = $dir;
 
     return $dirs;
-  }  
+  }
 
   protected function _loadCache()
   {
@@ -99,12 +103,12 @@
       $aliases = array_map('strtolower', $aliases);
       $names = array_merge($names, $aliases);
     }
-    
+
     foreach($names as $tag_name)
     {
       if(isset($this->info[$tag_name]))
         return;
-  
+
       $this->info[$tag_name] = $tag_info;
     }
   }