From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 9 Feb 2016 19:16:38 +0000 (+0100)
Subject: Merge branch 'next' into next-lantia
X-Git-Tag: 3.0.0_Beta_1~2030^2~93
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9480fe650ddbe7b927911241e3b720ce8c7b75cf;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' into next-lantia
---

9480fe650ddbe7b927911241e3b720ce8c7b75cf
diff --cc wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
index c08478b9fb,e35b09a547..6bb237ce4a
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
@@@ -199,19 -196,14 +199,19 @@@ define(['Dictionary', 'Dom/Traverse', '
  				}
  			}
  			
 -			name = name || elAttr(tab, 'data-name');
 +			name = name || elData(tab, 'name');
  			
  			// unmark active tab
- 			var oldTab = elBySel('#' + this._container.id + ' > nav > ul > li.active');
+ 			var oldTab = this.getActiveTab();
  			var oldContent = null;
  			if (oldTab) {
 +				if (elData(oldTab, 'name') === name) {
 +					// same tab
 +					return;
 +				}
 +				
  				oldTab.classList.remove('active');
 -				oldContent = this._containers.get(elAttr(oldTab, 'data-name'));
 +				oldContent = this._containers.get(elData(oldTab, 'name'));
  				oldContent.classList.remove('active');
  				oldContent.classList.add('hidden');
  				
diff --cc wcfsetup/install/files/lib/data/user/UserAction.class.php
index e2c4b1e2ec,c04935cb9c..42c49bd970
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@@ -302,10 -302,10 +302,10 @@@ class UserAction extends AbstractDataba
  	}
  	
  	/**
 -	 * @see	\wcf\data\AbstractDatabaseObjectAction::update()
 +	 * @inheritDoc
  	 */
  	public function update() {
- 		if (isset($this->parameters['data'])) {
+ 		if (isset($this->parameters['data']) || isset($this->parameters['counters'])) { 
  			parent::update();
  			
  			if (isset($this->parameters['data']['languageID'])) {
diff --cc wcfsetup/install/lang/en.xml
index 7db8a801c4,2fb8071856..d825ff28f6
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -633,13 -637,13 +633,13 @@@ Examples for medium ID detection
  		<item name="wcf.acp.menu.link.group.assignment"><![CDATA[Automatic Assignments]]></item>
  		<item name="wcf.acp.menu.link.notice"><![CDATA[Notices]]></item>
  		<item name="wcf.acp.menu.link.notice.add"><![CDATA[Add Notice]]></item>
 -		<item name="wcf.acp.menu.link.notice.list"><![CDATA[List Notices]]></item>
 +		<item name="wcf.acp.menu.link.notice.list"><![CDATA[Notices]]></item>
- 		<item name="wcf.acp.menu.link.ad"><![CDATA[Ad]]></item>
+ 		<item name="wcf.acp.menu.link.ad"><![CDATA[Ads]]></item>
  		<item name="wcf.acp.menu.link.ad.add"><![CDATA[Add Ad]]></item>
 -		<item name="wcf.acp.menu.link.ad.list"><![CDATA[List Ads]]></item>
 +		<item name="wcf.acp.menu.link.ad.list"><![CDATA[Ads]]></item>
  		<item name="wcf.acp.menu.link.captcha"><![CDATA[Captchas]]></item>
  		<item name="wcf.acp.menu.link.captcha.question.add"><![CDATA[Add Question]]></item>
 -		<item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[List Questions]]></item>
 +		<item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[Questions]]></item>
  		<item name="wcf.acp.menu.link.log.authentication.failure"><![CDATA[Failed Login Attempts]]></item>
  		<item name="wcf.acp.menu.link.paidSubscription"><![CDATA[Paid Subscriptions]]></item>
  		<item name="wcf.acp.menu.link.paidSubscription.list"><![CDATA[List Paid Subscriptions]]></item>
@@@ -1935,9 -1936,8 +1936,9 @@@ Errors are
  		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword"><![CDATA[Send New Password ({#$count})]]></item>
  		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword.confirmMessage"><![CDATA[Do you really want to send a new password to {#$count} user{if $count != 1}s{/if}?]]></item>
  		
- 		<item name="wcf.clipboard.label.com.woltlab.wcf.media.marked"><![CDATA[{#$count} File{if $count != 1}s{/if} marked]]></item>
- 		<item name="wcf.clipboard.label.com.woltlab.wcf.tag.marked"><![CDATA[{#$count} Tag{if $count != 1}s{/if} marked]]></item>
- 		<item name="wcf.clipboard.label.com.woltlab.wcf.user.marked"><![CDATA[{#$count} User{if $count != 1}s{/if} marked]]></item>
++		<item name="wcf.clipboard.label.com.woltlab.wcf.media.marked"><![CDATA[{if $count == 1}One File{else}{#$count} Files{/if} marked]]></item>
+ 		<item name="wcf.clipboard.label.com.woltlab.wcf.tag.marked"><![CDATA[{if $count == 1}One Tag{else}{#$count} Tags{/if} marked]]></item>
+ 		<item name="wcf.clipboard.label.com.woltlab.wcf.user.marked"><![CDATA[{if $count == 1}One User{else}{#$count} Users{/if} marked]]></item>
  	</category>
  	
  	<category name="wcf.comment">