Merge branch '2.0'

diff --cc wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
index 05704a1593d54beb9f073cd5e6d374f940e0f3a7,f3cc0f3bf8eb39f5a293756b0972cb5bb174eff9..05ea693c0b863fbaff2baf3b29c458613aff0a51
--- 1/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
--- 2/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();