Fixed issue #17700: Custom logo disappears in extended themes (#2459)

LimeSurvey · Jun 23, 2022 · 888b46f · 888b46f
1 parent 297841a
commit 888b46f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -414,15 +414,15 @@ public static function getInstance($sTemplateName = null, $iSurveyGroupId = null
             $oTemplateConfigurationModel = TemplateConfiguration::getInstanceFromSurveyGroup(
                 $iSurveyGroupId,
                 $sTemplateName,
-                $abstractInstance
+                true
             );
         }
 
         if ($iSurveyId != null) {
             $oTemplateConfigurationModel = TemplateConfiguration::getInstanceFromSurveyId(
                 $iSurveyId,
                 $sTemplateName,
-                $abstractInstance
+                true
             );
         }
 

diff --git a/assets/packages/themeoptions-core/themeoptions-core.js b/assets/packages/themeoptions-core/themeoptions-core.js
@@ -205,9 +205,11 @@ var ThemeOptions = function () {
                 console.error('No valid monochrom theme field!');
             }
 
-            $('#simple_edit_add_css').val(currentThemeObject.add.filter(function (item, i) {
-                return /^css\/variations\/.*$/.test(item);
-            }));
+            if (currentThemeObject.add) {
+                $('#simple_edit_add_css').val(currentThemeObject.add.filter(function (item, i) {
+                    return /^css\/variations\/.*$/.test(item);
+                }));
+            }
         }
 
     };