Changeset 8236

Timestamp:

12/26/08 06:00:55 (3 years ago)

Author:

Sergey Zotov

Message:

 

Location:

trunk

Files:

• inc/classes/BxDolTemplate.php (modified) (1 diff)
• inc/db_cached (modified) (1 prop)
• install/index.php (modified) (1 diff)

trunk/inc/classes/BxDolTemplate.php

@@ -246 +246 @@
         }
 
-        $aSelection = array_merge($aInjections['page_0'][$sKey], $aInjections['page_' . $iPageIndex][$sKey]);
-        foreach($aSelection as $aInjection) {
-            switch($aInjection['type']) {
-                case 'text':
-                    $sInjData = $aInjection['data'];
-                    break;
-                case 'php':
-                    ob_start();
-                    eval($aInjection['data']);
-                    $sInjData = ob_get_clean();
-                    break;
-            }            
-            if((int)$aInjection['replace'] == 1)
-                $sValue = $sInjData;
-            else 
-                $sValue .= $sInjData;
-        }
+        $aSelection = @array_merge($aInjections['page_0'][$sKey], $aInjections['page_' . $iPageIndex][$sKey]);
+        if (is_array($aSelections))
+            foreach($aSelection as $aInjection) {
+                switch($aInjection['type']) {
+                    case 'text':
+                        $sInjData = $aInjection['data'];
+                        break;
+                    case 'php':
+                        ob_start();
+                        eval($aInjection['data']);
+                        $sInjData = ob_get_clean();
+                        break;
+                }            
+                if((int)$aInjection['replace'] == 1)
+                    $sValue = $sInjData;
+                else 
+                    $sValue .= $sInjData;
+            }
+        
         return $sValue != '__' . $sKey . '__' ? str_replace('__' . $sKey . '__', '', $sValue) : $sValue;
     }

trunk/install/index.php

@@ -30 +30 @@
     $aConf = array();
     $aConf['release'] = '16.07.08';
-    $aConf['iVersion'] = '6.1';
-    $aConf['iPatch'] = '4';
+    $aConf['iVersion'] = '7.0';
+    $aConf['iPatch'] = 'alpha';
     $aConf['dolFile'] = '../inc/header.inc.php';
     $aConf['periodicFile'] = '../periodic/periodic.file';