Fixed issue #13365: custom.css never gets loaded

Fixed issue: some options not loaded on uninheriting the parent theme
LimeSurvey · Feb 16, 2018 · eba40fd · LouisGac · Feb 16, 2018 · lacrioque
1 parent 92dafe0
commit eba40fd
Show file tree

Hide file tree

Showing 5 changed files with 508 additions and 384 deletions.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -632,7 +632,7 @@ public function getOptionPage()
         $oTemplate->setOptions();
         $oTemplate->setOptionInheritance();
 
-        $renderArray['oParentOptions'] = (array) $oTemplate->oOptions;
+        $renderArray['oParentOptions'] = array_merge(((array) $oTemplate->oOptions), array('packages_to_load' =>  json_encode($oTemplate->packages_to_load), 'files_css' => json_encode($oTemplate->files_css)));
 
         return Yii::app()->twigRenderer->renderOptionPage($oTemplate, $renderArray);
     }