From bf147ca9d96df6e3ab38001b34349dae0e74ed45 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 2 Jan 2015 01:43:31 +0100 Subject: [PATCH] Hashtags in attached link description now don't create misformatted text anymore. --- include/bbcode.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 724b8e2fdd..1f635e051b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -41,7 +41,9 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) { if ($matches[1] != "") $title = $matches[1]; - $title = htmlentities($title, ENT_QUOTES, 'UTF-8', false); + //$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false); + $title = bbcode(html_entity_decode($title), false, false, true); + $title = str_replace(array("[", "]"), array("[", "]"), $title); $image = ""; if ($type != "video") { @@ -1171,6 +1173,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $a->save_timestamp($stamp1, "parser"); - return $Text; + return trim($Text); } ?>