Dev: follow up : old template compatibility

Dev: efb3542 child
LimeSurvey · Feb 6, 2016 · 2aba8f0 · 2aba8f0
1 parent efb3542
commit 2aba8f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/application/models/Template.php b/application/models/Template.php
@@ -173,10 +173,11 @@ public static function getTemplateConfiguration($sTemplateName='', $iSurveyId=''
             {
                 $oTemplate->name = $sTemplateName;
                 $oTemplate->path = Yii::app()->getConfig("usertemplaterootdir").DIRECTORY_SEPARATOR.$oTemplate->name;
-                $oTemplate->config = Yii::app()->getConfig("standardtemplaterootdir").DIRECTORY_SEPARATOR.'/minimal-config.xml';
+                $oTemplate->config = simplexml_load_file(Yii::app()->getConfig("standardtemplaterootdir").DIRECTORY_SEPARATOR.'/minimal-config.xml');
                 /* /./ working for linux, untested with windows
                 $oTemplate->viewPath = $oTemplate->path.DIRECTORY_SEPARATOR.$oTemplate->config->engine->pstpldirectory.DIRECTORY_SEPARATOR;
                 * */
+                $oTemplate->cssFramework = null;
                 $oTemplate->viewPath = $oTemplate->path.DIRECTORY_SEPARATOR;
                 $oTemplate->packages = (array) $oTemplate->config->engine->packages->package;
                 return $oTemplate;

diff --git a/templates/minimal-config.xml b/templates/minimal-config.xml
@@ -24,8 +24,8 @@
     </files>
     <engine>
         <packages>
-            <!-- If need a specific system for 206 template -->
-            <!-- <cssframework>206</cssframework> -->
+            <cssframework></cssframework>
+            <pstpldirectory>.</pstpldirectory>
             <package>jqueryui</package>
             <package>jquery-touch-punch</package>
         </packages>