diff --git a/include/bbcode.php b/include/bbcode.php index 6c5a400ddc..e872d859c5 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -887,8 +887,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $MAILSearchString = $URLSearchString; // Remove all hashtag addresses - if ((!$tryoembed OR $simplehtml) AND ($simplehtml != 7)) + if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); + elseif ($simplehtml == 3) + $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + '$1$3', + $Text); elseif ($simplehtml == 7) $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3',