From 5213972a39499bee72047714a63d20926dc441f8 Mon Sep 17 00:00:00 2001
From: markusfluer <fluer.markus@googlemail.com>
Date: Thu, 15 Mar 2018 16:47:42 +0100
Subject: [PATCH] Dev: fixed issues with TextDisplayWidget

---
 application/core/LS_Twig_Extension.php                     | 3 ++-
 .../admin/TextDisplaySwitch/TextDisplaySwitch.php          | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/core/LS_Twig_Extension.php b/application/core/LS_Twig_Extension.php
index b8be861510e..90e986423f3 100644
--- 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
index be3571a2fa7..ca4ed59fb56 100644
--- 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);
 
     }