From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 25 Apr 2016 13:57:19 +0000 (+0200)
Subject: Fixed follow/block buttons
X-Git-Tag: 3.0.0_Beta_1~1817
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=309621673ac54b588d873f158c8532acf79fcf62;p=GitHub%2FWoltLab%2FWCF.git

Fixed follow/block buttons
---

diff --git a/com.woltlab.wcf/templates/userInformationButtons.tpl b/com.woltlab.wcf/templates/userInformationButtons.tpl
index e53dfc0be3..b681b6660b 100644
--- a/com.woltlab.wcf/templates/userInformationButtons.tpl
+++ b/com.woltlab.wcf/templates/userInformationButtons.tpl
@@ -15,19 +15,21 @@
 				{/if}
 				
 				{if $__wcf->user->userID && $user->userID != $__wcf->user->userID}
-					{if $__wcf->getUserProfileHandler()->isFollowing($user->userID)}
-						<li class="jsOnly"><a href="#" data-following="1" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}"><span class="icon icon16 fa-minus"></span> <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
-					{else}
-						<li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}"><span class="icon icon16 fa-plus"></span> <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
+					{if !$user->isIgnoredUser($__wcf->user->userID)}
+						{if $__wcf->getUserProfileHandler()->isFollowing($user->userID)}
+							<li class="jsOnly"><a href="#" data-following="1" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}"><span class="icon icon16 fa-minus"></span> <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
+						{else}
+							<li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}"><span class="icon icon16 fa-plus"></span> <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
+						{/if}
 					{/if}
 					
-					{*if !$user->getPermission('user.profile.cannotBeIgnored')*}{*disabled for performance reasons*}
+					{if !$user->getPermission('user.profile.cannotBeIgnored')}
 						{if $__wcf->getUserProfileHandler()->isIgnoredUser($user->userID)}
 							<li class="jsOnly"><a href="#" data-ignored="1" data-object-id="{@$user->userID}" class="jsIgnoreButton jsTooltip" title="{lang}wcf.user.button.unignore{/lang}"><span class="icon icon16 fa-circle-o"></span> <span class="invisible">{lang}wcf.user.button.unignore{/lang}</span></a></li>
 						{else}
 							<li class="jsOnly"><a href="#" data-ignored="0" data-object-id="{@$user->userID}" class="jsIgnoreButton jsTooltip" title="{lang}wcf.user.button.ignore{/lang}"><span class="icon icon16 fa-ban"></span> <span class="invisible">{lang}wcf.user.button.ignore{/lang}</span></a></li>
 						{/if}
-					{*/if*}
+					{/if}
 				{/if}
 				
 				{event name='buttons'}
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 019fcbc6a2..5135e44cfd 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -2190,7 +2190,7 @@ WCF.User.Action.Ignore = Class.extend({
 			'className': 'wcf\\data\\user\\ignore\\UserIgnoreAction',
 			'parameters': {
 				data: {
-					ignoreUserID: this._userID
+					userID: this._userID
 				}
 			}
 		});