From 1263f7b98a21c91ab906bd55433ab60f2eb33ffa Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 18 Aug 2016 20:10:06 +0200
Subject: [PATCH] Improved styling of user mentions

---
 com.woltlab.wcf/templates/userBBCodeTag.tpl              | 5 ++---
 .../install/files/lib/system/bbcode/UserBBCode.class.php | 3 ---
 wcfsetup/install/files/style/bbcode/userMention.scss     | 9 +++++++++
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 wcfsetup/install/files/style/bbcode/userMention.scss

diff --git a/com.woltlab.wcf/templates/userBBCodeTag.tpl b/com.woltlab.wcf/templates/userBBCodeTag.tpl
index 540243b6c1..7cd4355def 100644
--- a/com.woltlab.wcf/templates/userBBCodeTag.tpl
+++ b/com.woltlab.wcf/templates/userBBCodeTag.tpl
@@ -1,7 +1,6 @@
 {if $userProfile === null}
 	{* user no longer exists, use plain output rather than using a broken link *}
-	@{$username}
+	<span class="userMention">{$username}</span>
 {else}
-	{* non-breaking space below to prevent wrapping of user avatar and username *}
-	<a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}">{@$userProfile->getAvatar()->getImageTag(16)}&nbsp;{$userProfile->username}</a>
+	<a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="userMention userLink" data-user-id="{@$userProfile->userID}">{$userProfile->username}</a>
 {/if}
diff --git a/wcfsetup/install/files/lib/system/bbcode/UserBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/UserBBCode.class.php
index d8bc47be60..7b00ec22d9 100644
--- a/wcfsetup/install/files/lib/system/bbcode/UserBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/UserBBCode.class.php
@@ -25,9 +25,6 @@ class UserBBCode extends AbstractBBCode {
 		
 		/** @var UserProfile $userProfile */
 		$userProfile = MessageEmbeddedObjectManager::getInstance()->getObject('com.woltlab.wcf.user', $userID);
-		if ($userProfile === null) {
-			return '@'.$content;
-		}
 		
 		return WCF::getTPL()->fetch('userBBCodeTag', 'wcf', [
 			'username' => $content,
diff --git a/wcfsetup/install/files/style/bbcode/userMention.scss b/wcfsetup/install/files/style/bbcode/userMention.scss
new file mode 100644
index 0000000000..7c9ff03225
--- /dev/null
+++ b/wcfsetup/install/files/style/bbcode/userMention.scss
@@ -0,0 +1,9 @@
+.userMention {
+	background-color: $wcfSidebarBackground;
+	border-radius: 2px;
+	padding: 2px 5px;
+	
+	&::before {
+		content: '@';
+	}
+}
-- 
2.20.1