Dev: Run theme related things only if a theme is provided

LimeSurvey · Jun 6, 2018 · 0642064 · 0642064
1 parent 77dc4a8
commit 0642064
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
@@ -329,14 +329,17 @@ public function convertTwigToHtml($sString, $aDatas, $oTemplate = null)
         // Twig init
         $this->_twig = $twig = parent::getTwig();
 
-        // Get the additional infos for the view, such as language, direction, etc
-        $aDatas = $this->getAdditionalInfos($aDatas, $oTemplate);
+        //Run theme related things only if a theme is provided!
+        if ($oTemplate !== null) {
+            // Get the additional infos for the view, such as language, direction, etc
+            $aDatas = $this->getAdditionalInfos($aDatas, $oTemplate);
 
-        // Add to the loader the path of the template and its parents.
-        $this->addRecursiveTemplatesPath($oTemplate);
+            // Add to the loader the path of the template and its parents.
+            $this->addRecursiveTemplatesPath($oTemplate);
 
-        // Plugin for blocks replacement
-        list($sString, $aDatas) = $this->getPluginsData($sString, $aDatas);
+            // Plugin for blocks replacement
+            list($sString, $aDatas) = $this->getPluginsData($sString, $aDatas);
+        }
 
         // Twig rendering
         $oTwigTemplate = $twig->createTemplate($sString);