Fixed issue #14941: Variations choosed in Global theme options are no…

…t set in preview
LimeSurvey · May 29, 2019 · 7ea69d5 · 7ea69d5
1 parent 8820d96
commit 7ea69d5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/application/controllers/admin/themes.php b/application/controllers/admin/themes.php
@@ -916,7 +916,7 @@ protected function _templatesummary($templatename, $screenname, $editfile, $rela
     protected function _initialise($templatename, $screenname, $editfile, $showsummary = true)
     {
         // LimeSurvey style
-        $oEditedTemplate = Template::getInstance($templatename, null, null, true);
+        $oEditedTemplate = Template::getInstance($templatename, null, null, true, true)->prepareTemplateRendering($templatename, null, true);
 
             //App()->getClientScript()->reset();
         Yii::app()->loadHelper('surveytranslator');
@@ -1250,6 +1250,8 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
 
         $thissurvey['include_content'] = $sContentFile;
 
+        // new TemplateConfiguration model created so preview can read theme options from DB
+        $oTemplateForPreview = Template::getInstance($templatename, null, null, false)->prepareTemplateRendering($templatename, null, true);
 
         try {
             $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor(
@@ -1258,7 +1260,7 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
                     'aSurveyInfo' =>$thissurvey,
                     'print'       => $print  // Only used for PDF print layout.
                 ),
-                $oEditedTemplate
+                $oTemplateForPreview
             );
         } catch (Exception $ex) {
             $myoutput = "<h3>ERROR!</h3>";