nl2br so we get proper newlining when publishing \r, \n or \r\n

diff --git a/lib/util.php b/lib/util.php
index 7b75a467843f1c56452c3d1218c76cd166000712..9f7eac90f9a4b560cbcdf623724e9a47884bc327 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -832,7 +832,7 @@ function common_find_mentions_raw($text)
 
 function common_render_text($text)
 {
-    $r = htmlspecialchars($text);
+    $r = nl2br(htmlspecialchars($text));
 
     $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
     $r = common_replace_urls_callback($r, 'common_linkify');