From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 29 Sep 2016 07:37:50 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_2~74
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7243f3532eeb59aa153dc7ad488da63b4cc8921a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

7243f3532eeb59aa153dc7ad488da63b4cc8921a
diff --cc wcfsetup/install/files/js/WCF.User.js
index 262adb9b00,986ab3ee0f..ea96f1dace
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@@ -2119,10 -2320,12 +2119,12 @@@ WCF.User.Action.Follow = Class.extend(
  				
  				// toogle icon title
  				if (data.returnValues.following) {
 -					button.data('tooltip', WCF.Language.get('wcf.user.button.unfollow')).children('.icon').removeClass('icon-plus').addClass('icon-minus');
 +					button.attr('data-tooltip', WCF.Language.get('wcf.user.button.unfollow')).children('.icon').removeClass('fa-plus').addClass('fa-minus');
+ 					button.children('.invisible').text(WCF.Language.get('wcf.user.button.unfollow'));
  				}
  				else {
 -					button.data('tooltip', WCF.Language.get('wcf.user.button.follow')).children('.icon').removeClass('icon-minus').addClass('icon-plus');
 +					button.attr('data-tooltip', WCF.Language.get('wcf.user.button.follow')).children('.icon').removeClass('fa-minus').addClass('fa-plus');
+ 					button.children('.invisible').text(WCF.Language.get('wcf.user.button.follow'));
  				}
  				
  				button.data('following', data.returnValues.following);
@@@ -2226,10 -2435,12 +2228,12 @@@ WCF.User.Action.Ignore = Class.extend(
  				
  				// toogle icon title
  				if (data.returnValues.isIgnoredUser) {
 -					button.data('tooltip', WCF.Language.get('wcf.user.button.unignore')).children('.icon').removeClass('icon-ban-circle').addClass('icon-circle-blank');
 +					button.attr('data-tooltip', WCF.Language.get('wcf.user.button.unignore')).children('.icon').removeClass('fa-ban').addClass('fa-circle-o');
+ 					button.children('.invisible').text(WCF.Language.get('wcf.user.button.unignore'));
  				}
  				else {
 -					button.data('tooltip', WCF.Language.get('wcf.user.button.ignore')).children('.icon').removeClass('icon-circle-blank').addClass('icon-ban-circle');
 +					button.attr('data-tooltip', WCF.Language.get('wcf.user.button.ignore')).children('.icon').removeClass('fa-circle-o').addClass('fa-ban');
+ 					button.children('.invisible').text(WCF.Language.get('wcf.user.button.ignore'));
  				}
  				
  				button.data('ignored', data.returnValues.isIgnoredUser);