Dev: fixed issue: inheritance only works when layout file changed loc…

…ally
LimeSurvey · Jul 17, 2017 · 6f39527 · 6f39527
1 parent 2feb794
commit 6f39527
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
@@ -139,7 +139,7 @@ public function renderTemplateForTemplateEditor($sView, $aDatas, $oEditedTemplat
     {
         $oTemplate = $this->getTemplateForView($sView, $oEditedTemplate);
         $line      = file_get_contents($oTemplate->viewPath.$sView);
-        $result = $this->renderTemplateFromString( $line, $aDatas, $oTemplate, true);
+        $result    = $this->renderTemplateFromString( $line, $aDatas, $oEditedTemplate, true);
         return $result;
     }
 
@@ -148,7 +148,7 @@ public function renderTemplateFromFile($sView, $aDatas, $bReturn)
         $oRTemplate = Template::model()->getInstance();
         $oTemplate = $this->getTemplateForView($sView, $oRTemplate);
         $line      = file_get_contents($oTemplate->viewPath.$sView);
-        $result = $this->renderTemplateFromString( $line, $aDatas, $oTemplate, $bReturn);
+        $result = $this->renderTemplateFromString( $line, $aDatas, $oRTemplate, $bReturn);
         if ($bReturn){
             Yii::app()->clientScript->registerPackage( $oRTemplate->sPackageName );
             return $result;