Dev: moved $bUseMagicInherit setting out of prepareTemplateRendering()

LimeSurvey · Aug 9, 2018 · 1d5c451 · 1d5c451
1 parent d6ce1f5
commit 1d5c451
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -502,19 +502,19 @@ public function prepareTemplateRendering($sTemplateName = '', $iSurveyId = '', $
             return self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit];
         }
 
-        $this->bUseMagicInherit = $bUseMagicInherit;
-        $this->setBasics($sTemplateName, $iSurveyId);
+        $this->setBasics($sTemplateName, $iSurveyId, $bUseMagicInherit);
         $this->setMotherTemplates(); // Recursive mother templates configuration
         $this->setThisTemplate(); // Set the main config values of this template
-        $this->createTemplatePackage($this); // Create an asset package ready to be loaded#
+        $this->createTemplatePackage($this); // Create an asset package ready to be loaded
         $this->getshowpopups();
 
         self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit] = $this;
         return $this;
     }
 
-    public function setBasics($sTemplateName = '', $iSurveyId = '')
+    public function setBasics($sTemplateName = '', $iSurveyId = '', $bUseMagicInherit = false)
     {
+        $this->bUseMagicInherit = $bUseMagicInherit;
         $this->sTemplateName = $this->template->name;
         $this->setIsStandard(); // Check if  it is a CORE template
         $this->path = ($this->isStandard)