Dev: $aPreparedToRender should not be used from admin.

LimeSurvey · Aug 9, 2018 · 7452365 · 7452365
1 parent 30d9d67
commit 7452365
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php
@@ -126,10 +126,30 @@ public function getTemplateURL()
      */
     public function prepareTemplateRendering($sTemplateName = '', $iSurveyId = '', $bUseMagicInherit = true)
     {
-        if (!empty(self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit])) {
-           return self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit];
+
+        if (!empty ($sTemplateName) && !empty ($iSurveyId)  ){
+            if (!empty(self::$aPreparedToRender[$sTemplateName])) {
+                if (!empty(self::$aPreparedToRender[$sTemplateName][$iSurveyId])) {
+                    if (!empty(self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit])) {
+                       return self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit];
+                   }else{
+                    self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit] = array();
+                   }
+                }else{
+                    self::$aPreparedToRender[$sTemplateName][$iSurveyId] = array();
+                    self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit] = array();
+                }
+
+            }else{
+                self::$aPreparedToRender = array();
+                self::$aPreparedToRender[$sTemplateName][$iSurveyId] = array();
+                self::$aPreparedToRender[$sTemplateName][$iSurveyId][$bUseMagicInherit] = array();
+            }
         }
 
+
+
+
         $this->setBasics($sTemplateName, $iSurveyId, $bUseMagicInherit);
         $this->setMotherTemplates(); // Recursive mother templates configuration
         $this->setThisTemplate(); // Set the main config values of this template