From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Apr 2014 12:20:41 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~866^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4c92bec9ddc088d613c8c213e813b08d635ace94;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

4c92bec9ddc088d613c8c213e813b08d635ace94
diff --cc wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
index 05704a1593,f3cc0f3bf8..05ea693c0b
--- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
@@@ -273,18 -266,14 +273,18 @@@ class UserEditForm extends UserAddForm 
  				'signature' => $this->signature,
  				'signatureEnableBBCodes' => $this->signatureEnableBBCodes,
  				'signatureEnableSmilies' => $this->signatureEnableSmilies,
 -				'signatureEnableHtml' => $this->signatureEnableHtml,
 -				'disableSignature' => $this->disableSignature,
 -				'disableSignatureReason' => $this->disableSignatureReason
 +				'signatureEnableHtml' => $this->signatureEnableHtml
  			)),
  			'groups' => $this->groupIDs,
- 			'languages' => $this->visibleLanguages,
+ 			'languageIDs' => $this->visibleLanguages,
  			'options' => $saveOptions
  		);
 +		
 +		if (WCF::getSession()->getPermission('admin.user.canDisableSignature')) {
 +			$data['data']['disableSignature'] = $this->disableSignature;
 +			$data['data']['disableSignatureReason'] = $this->disableSignatureReason;
 +		}
 +		
  		$this->objectAction = new UserAction(array($this->userID), 'update', $data);
  		$this->objectAction->executeAction();