Fixed issue #14559: Theme editor loads parent theme.css file instead …

…of current theme.css file
LimeSurvey · May 27, 2019 · 206c3aa · 206c3aa · Shnoulle · May 28, 2019
1 parent 1d4f8d3
commit 206c3aa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php
@@ -267,7 +267,7 @@ protected function createTemplatePackage($oTemplate)
         $aJsFiles   = array_merge($aJsFiles, $aTJsFiles);
 
         // Remove/Replace mother template files
-        if ( ( $this->template instanceof Template &&  $this->template->extends) || Yii::app()->getConfig('force_xmlsettings_for_survey_rendering') ){
+        if ( ( $this->template instanceof Template &&  $this->template->extends) || !empty($this->config->metadata->extends) || Yii::app()->getConfig('force_xmlsettings_for_survey_rendering') ){
           $aCssFiles = $this->changeMotherConfiguration('css', $aCssFiles);
           $aJsFiles  = $this->changeMotherConfiguration('js', $aJsFiles);
         }