Dev: fixed issues with TextDisplayWidget

LimeSurvey · Mar 15, 2018 · 5213972 · 5213972
1 parent 086883f
commit 5213972
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/application/core/LS_Twig_Extension.php b/application/core/LS_Twig_Extension.php
@@ -312,11 +312,12 @@ public static function getTextDisplayWidget($sInString, $name) {
         templatereplace(flattenText($sInString));
         $fullInString = LimeExpressionManager::GetLastPrettyPrintExpression();
 
-        return $this->widget('ext.admin.TextDisplaySwitch.TextDisplaySwitch', array(
+        $widget = App()->getController()->widget('ext.admin.TextDisplaySwitch.TextDisplaySwitch', array(
             'widgetsJsName' =>  $name,
             'textToDisplay' => $fullInString,
             'returnHtml' => true
         ));
+        return $widget->run();
     }
 
 

diff --git a/application/extensions/admin/TextDisplaySwitch/TextDisplaySwitch.php b/application/extensions/admin/TextDisplaySwitch/TextDisplaySwitch.php
@@ -13,7 +13,12 @@ public function run() {
 
         $this->registerScripts();
         $outView = (strlen($this->textToDisplay) > $this->abbreviationSize) ? 'default' : 'short';
-        $this->render($outView, null, $returnHtml);
+
+        if( $this->returnHtml ){
+            return $this->render($outView, null, true);
+        }
+
+        $this->render($outView);
 
     }