Merge branch '2023.11' into 2024.11

tine-groupware · Jan 11, 2024 · 933277b · 933277b
2 parents 227aeea + 4d4fd26
commit 933277b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tine20/Tinebase/js/EncodingHelper.js b/tine20/Tinebase/js/EncodingHelper.js
@@ -28,7 +28,8 @@ Tine.Tinebase.EncodingHelper = {
         }
 
         value = Ext.util.Format.htmlEncode(value);
-        return Ext.util.Format.nl2br(value);
+        // @TODO for HTMLProxies we should invent some kind of chain we can hook into
+        return value.isExpression ? value : Ext.util.Format.nl2br(value);
     }
 };