Fixed issue: options from mother template always used at import

LimeSurvey · Dec 11, 2017 · 99b558c · 99b558c
1 parent 03260bd
commit 99b558c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -341,7 +341,7 @@ public static function importManifest($sTemplateName, $aDatas = array())
                 $aDatas['version']         = $oMotherTemplate->template->version;
                 $aDatas['license']         = $oMotherTemplate->template->license;
                 $aDatas['files_folder']    = $oMotherTemplate->template->files_folder;
-                $aDatas['aOptions']        = json_decode($oMotherTemplate->options);
+                $aDatas['aOptions']        = (empty($aDatas['aOptions'])) ? json_decode($oMotherTemplate->options): $aDatas['aOptions'];
             }
         }