Fixed issue #11493: Old templates cause surveys and "Theme Editor" to…

… display an empty page
LimeSurvey · Jul 27, 2016 · 69ed38d · 69ed38d
1 parent 042f5bd
commit 69ed38d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -165,8 +165,8 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
             }
             else
             {
-                $aCssFiles = $oTemplate->config->files->css->filename;
-                $aJsFiles = $oTemplate->config->files->js->filename;
+                $aCssFiles = (array) $oTemplate->config->files->css->filename;
+                $aJsFiles  = (array) $oTemplate->config->files->js->filename;
 
                 foreach($aCssFiles as $sCssFile)
                 {

diff --git a/templates/minimal-config.xml b/templates/minimal-config.xml
@@ -11,14 +11,12 @@
             <filename>template.css</filename>
         </css>
         <js>
-            <filename>template.js</filename>
+            <filename>template.js</filename>            
         </js>
         <rtl>
             <css>
                 <filename>template-rtl.css</filename>
             </css>
-            <js>
-            </js>
         </rtl>
     </files>
 
@@ -37,7 +35,7 @@
 
     <engine>
         <filesdirectory>.</filesdirectory>
-        <cssframework></cssframework>
+        <cssframework>206</cssframework>
         <pstpldirectory>.</pstpldirectory> <!-- Broken edit pstpl file in template editor actually -->
         <packages>
             <package>jqueryui</package>