1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 3c1e7babbf..98bdb3bfcc 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -50,7 +50,13 @@ class bbcode
 
 		if (!$this->bbcode_bitfield)
 		{
-			return $message;
+			// Remove the uid from tags that have not been transformed into HTML
+			if ($this->bbcode_uid)
+			{
+				$message = str_replace(':' . $this->bbcode_uid, '', $message);
+			}
+
+			return;
 		}
 
 		$str = array('search' => array(), 'replace' => array());