From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 27 Nov 2013 23:42:17 +0000 (+0100)
Subject: Make $this->additionalFields available in every AbstractForm
X-Git-Tag: 2.0.0_RC_4~2^2~2^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e94d75561ec1b6cef5bc86a1dd6d770249b916c5;p=GitHub%2FWoltLab%2FWCF.git

Make $this->additionalFields available in every AbstractForm
---

diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
index f0f0f8714e..8364d7d75c 100644
--- a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
@@ -189,12 +189,12 @@ class ApplicationEditForm extends AbstractForm {
 		parent::save();
 		
 		// save application
-		$this->objectAction = new ApplicationAction(array($this->application->getDecoratedObject()), 'update', array('data' => array(
+		$this->objectAction = new ApplicationAction(array($this->application->getDecoratedObject()), 'update', array('data' => array_merge($this->additionalFields, array(
 			'cookieDomain' => $this->cookieDomain,
 			'cookiePath' => $this->cookiePath,
 			'domainName' => $this->domainName,
 			'domainPath' => $this->domainPath
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		$this->saved();
diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php
index e7f8c18636..2ddc366fdc 100644
--- a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php
@@ -216,7 +216,7 @@ class BBCodeAddForm extends AbstractForm {
 		parent::save();
 		
 		// save bbcode
-		$this->objectAction = new BBCodeAction(array(), 'create', array('data' => array(
+		$this->objectAction = new BBCodeAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'allowedChildren' => $this->allowedChildren,
 			'bbcodeTag' => $this->bbcodeTag,
 			'buttonLabel' => $this->buttonLabel,
@@ -227,7 +227,7 @@ class BBCodeAddForm extends AbstractForm {
 			'packageID' => 1,
 			'showButton' => ($this->showButton ? 1 : 0),
 			'wysiwygIcon' => $this->wysiwygIcon
-		)));
+		))));
 		$returnValues = $this->objectAction->executeAction();
 		foreach ($this->attributes as $attribute) {
 			$attributeAction = new BBCodeAttributeAction(array(), 'create', array('data' => array(
diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
index 7ba672203c..a1e8a13d38 100644
--- a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
@@ -92,7 +92,7 @@ class BBCodeEditForm extends BBCodeAddForm {
 		}
 		
 		// update bbcode
-		$this->objectAction = new BBCodeAction(array($this->bbcodeID), 'update', array('data' => array(
+		$this->objectAction = new BBCodeAction(array($this->bbcodeID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'allowedChildren' => $this->allowedChildren,
 			'bbcodeTag' => $this->bbcodeTag,
 			'buttonLabel' => $this->buttonLabel,
@@ -102,7 +102,7 @@ class BBCodeEditForm extends BBCodeAddForm {
 			'isSourceCode' => ($this->isSourceCode ? 1 : 0),
 			'showButton' => ($this->showButton ? 1 : 0),
 			'wysiwygIcon' => $this->wysiwygIcon
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		// clear existing attributes
diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php
index d8c131bd93..35cdb1f821 100644
--- a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php
@@ -93,11 +93,11 @@ class BBCodeMediaProviderAddForm extends AbstractForm {
 		parent::save();
 		
 		// save media provider
-		$this->objectAction = new BBCodeMediaProviderAction(array(), 'create', array('data' => array(
+		$this->objectAction = new BBCodeMediaProviderAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'title' => $this->title,
 			'regex' => $this->regex,
 			'html' => $this->html
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php
index ef1df2e2fa..4651741009 100644
--- a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php
@@ -59,11 +59,11 @@ class BBCodeMediaProviderEditForm extends BBCodeMediaProviderAddForm {
 		AbstractForm::save();
 		
 		// update media-provider
-		$this->objectAction = new BBCodeMediaProviderAction(array($this->providerID), 'update', array('data' => array(
+		$this->objectAction = new BBCodeMediaProviderAction(array($this->providerID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'title' => $this->title,
 			'regex' => $this->regex,
 			'html' => $this->html
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		$this->saved();
diff --git a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
index 14eef8bb62..b768169786 100755
--- a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
@@ -151,7 +151,7 @@ class CronjobAddForm extends AbstractForm {
 		parent::save();
 		
 		// save cronjob
-		$data = array(
+		$data = array_merge($this->additionalFields, array(
 			'className' => $this->className,
 			'packageID' => $this->packageID,
 			'description' => $this->description,
@@ -160,7 +160,7 @@ class CronjobAddForm extends AbstractForm {
 			'startDom' => $this->startDom,
 			'startMonth' => $this->startMonth,
 			'startDow' => $this->startDow
-		);
+		));
 		
 		$this->objectAction = new CronjobAction(array(), 'create', array('data' => $data));
 		$this->objectAction->executeAction();
diff --git a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
index a800e1a111..4744c4544a 100755
--- a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
@@ -66,7 +66,7 @@ class CronjobEditForm extends CronjobAddForm {
 		}
 		
 		// update cronjob
-		$data = array(
+		$data = array_merge($this->additionalFields, array(
 			'className' => $this->className,
 			'description' => $this->description,
 			'startMinute' => $this->startMinute,
@@ -74,7 +74,7 @@ class CronjobEditForm extends CronjobAddForm {
 			'startDom' => $this->startDom,
 			'startMonth' => $this->startMonth,
 			'startDow' => $this->startDow
-		);
+		));
 		
 		$this->objectAction = new CronjobAction(array($this->cronjobID), 'update', array('data' => $data));
 		$this->objectAction->executeAction();
diff --git a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php
index 0b3222350d..3d6a080755 100644
--- a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php
@@ -150,11 +150,11 @@ class LabelAddForm extends AbstractForm {
 		parent::save();
 		
 		// save label
-		$this->objectAction = new LabelAction(array(), 'create', array('data' => array(
+		$this->objectAction = new LabelAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'label' => $this->label,
 			'cssClassName' => ($this->cssClassName == 'custom' ? $this->customCssClassName : $this->cssClassName),
 			'groupID' => $this->groupID
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		if (!I18nHandler::getInstance()->isPlainValue('label')) {
diff --git a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
index 29a7cfdd71..7045469314 100644
--- a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
@@ -70,11 +70,11 @@ class LabelEditForm extends LabelAddForm {
 		}
 		
 		// update label
-		$this->objectAction = new LabelAction(array($this->labelID), 'update', array('data' => array(
+		$this->objectAction = new LabelAction(array($this->labelID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'label' => $this->label,
 			'cssClassName' => ($this->cssClassName == 'custom' ? $this->customCssClassName : $this->cssClassName),
 			'groupID' => $this->groupID
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		$objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.label.objectType');
diff --git a/wcfsetup/install/files/lib/acp/form/LabelGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelGroupAddForm.class.php
index 37f051a2da..40885b38a7 100644
--- a/wcfsetup/install/files/lib/acp/form/LabelGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelGroupAddForm.class.php
@@ -132,10 +132,10 @@ class LabelGroupAddForm extends AbstractForm {
 		parent::save();
 		
 		// save label
-		$this->objectAction = new LabelGroupAction(array(), 'create', array('data' => array(
+		$this->objectAction = new LabelGroupAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'forceSelection' => ($this->forceSelection ? 1 : 0),
 			'groupName' => $this->groupName
-		)));
+		))));
 		$returnValues = $this->objectAction->executeAction();
 		
 		// save acl
diff --git a/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php
index 6bce03e906..b56252b7a5 100644
--- a/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php
@@ -60,10 +60,10 @@ class LabelGroupEditForm extends LabelGroupAddForm {
 		AbstractForm::save();
 		
 		// update label
-		$this->objectAction = new LabelGroupAction(array($this->groupID), 'update', array('data' => array(
+		$this->objectAction = new LabelGroupAction(array($this->groupID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'forceSelection' => ($this->forceSelection ? 1 : 0),
 			'groupName' => $this->groupName
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		// update acl
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
index c7d829bee6..378dd09415 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
@@ -66,9 +66,9 @@ class LanguageServerAddForm extends AbstractForm {
 		parent::save();
 		
 		// save server
-		$this->objectAction = new LanguageServerAction(array(), 'create', array('data' => array(
+		$this->objectAction = new LanguageServerAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'serverURL' => $this->server
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
index 13506a97ea..171627573e 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
@@ -54,9 +54,9 @@ class LanguageServerEditForm extends LanguageServerAddForm {
 		AbstractForm::save();
 		
 		// save server
-		$this->objectAction = new LanguageServerAction(array($this->languageServerID), 'update', array('data' => array(
+		$this->objectAction = new LanguageServerAction(array($this->languageServerID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'serverURL' => $this->server
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php
index 50c892b37a..432c266d48 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php
@@ -80,11 +80,11 @@ class PackageUpdateServerAddForm extends AbstractForm {
 		parent::save();
 		
 		// save server
-		$this->objectAction = new PackageUpdateServerAction(array(), 'create', array('data' => array(
+		$this->objectAction = new PackageUpdateServerAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'serverURL' => $this->serverURL,
 			'loginUsername' => $this->loginUsername,
 			'loginPassword' => $this->loginPassword
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php
index 9739e0da6f..b460bfb5da 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php
@@ -49,11 +49,11 @@ class PackageUpdateServerEditForm extends PackageUpdateServerAddForm {
 		AbstractForm::save();
 		
 		// save server
-		$this->objectAction = new PackageUpdateServerAction(array($this->packageUpdateServerID), 'update', array('data' => array(
+		$this->objectAction = new PackageUpdateServerAction(array($this->packageUpdateServerID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'serverURL' => $this->serverURL,
 			'loginUsername' => $this->loginUsername,
 			'loginPassword' => $this->loginPassword
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/PageMenuItemAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PageMenuItemAddForm.class.php
index 5e8675ded7..d8bd2c3233 100644
--- a/wcfsetup/install/files/lib/acp/form/PageMenuItemAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageMenuItemAddForm.class.php
@@ -208,7 +208,7 @@ class PageMenuItemAddForm extends AbstractForm {
 	public function save() {
 		parent::save();
 		
-		$this->objectAction = new PageMenuItemAction(array(), 'create', array('data' => array(
+		$this->objectAction = new PageMenuItemAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'isDisabled' => ($this->isDisabled) ? 1 : 0,
 			'menuItem' => $this->pageMenuItem,
 			'menuItemController' => $this->menuItemController,
@@ -216,7 +216,7 @@ class PageMenuItemAddForm extends AbstractForm {
 			'menuPosition' => $this->menuPosition,
 			'parentMenuItem' => $this->parentMenuItem,
 			'showOrder' => $this->showOrder
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		$returnValues = $this->objectAction->getReturnValues();
diff --git a/wcfsetup/install/files/lib/acp/form/PageMenuItemEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PageMenuItemEditForm.class.php
index 16d883f8c7..b037bb0142 100644
--- a/wcfsetup/install/files/lib/acp/form/PageMenuItemEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageMenuItemEditForm.class.php
@@ -104,14 +104,14 @@ class PageMenuItemEditForm extends PageMenuItemAddForm {
 		}
 		
 		// save menu item
-		$this->objectAction = new PageMenuItemAction(array($this->menuItem), 'update', array('data' => array(
+		$this->objectAction = new PageMenuItemAction(array($this->menuItem), 'update', array('data' => array_merge($this->additionalFields, array(
 			'isDisabled' => ($this->isDisabled) ? 1 : 0,
 			'menuItemController' => $this->menuItemController,
 			'menuItemLink' => ($this->menuItemController ? $this->menuItemParameters : $this->menuItemLink),
 			'parentMenuItem' => ($this->menuPosition == 'header' ? $this->parentMenuItem : ''),
 			'menuPosition' => $this->menuPosition,
 			'showOrder' => $this->showOrder
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		// update children
diff --git a/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php b/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php
index e3fde733dc..4d6cfcc59c 100644
--- a/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php
@@ -142,7 +142,7 @@ class SmileyAddForm extends AbstractForm {
 		parent::save();
 		
 		$this->objectAction = new SmileyAction(array(), 'create', array(
-			'data' => array(
+			'data' => array_merge($this->additionalFields, array(
 				'smileyTitle' => $this->smileyTitle,
 				'smileyCode' => $this->smileyCode,
 				'aliases' => $this->aliases,
@@ -150,7 +150,7 @@ class SmileyAddForm extends AbstractForm {
 				'showOrder' => $this->showOrder,
 				'categoryID' => $this->categoryID ?: null,
 				'packageID' => 1
-			)
+			))
 		));
 		$this->objectAction->executeAction();
 		$returnValues = $this->objectAction->getReturnValues();
diff --git a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
index e736dcbbe4..444f514834 100644
--- a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
@@ -69,14 +69,14 @@ class SmileyEditForm extends SmileyAddForm {
 		}
 		
 		// update bbcode
-		$this->objectAction = new SmileyAction(array($this->smileyID), 'update', array('data' => array(
+		$this->objectAction = new SmileyAction(array($this->smileyID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'smileyTitle' => $this->smileyTitle,
 			'smileyCode' => $this->smileyCode,
 			'aliases' => $this->aliases,
 			'smileyPath' => $this->smileyPath,
 			'showOrder' => $this->showOrder,
 			'categoryID' => $this->categoryID ?: null
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		$this->saved();
diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
index 7b5f685a59..4b43b84a53 100644
--- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
@@ -466,7 +466,7 @@ class StyleAddForm extends AbstractForm {
 		parent::save();
 		
 		$this->objectAction = new StyleAction(array(), 'create', array(
-			'data' => array(
+			'data' => array_merge($this->additionalFields, array(
 				'styleName' => $this->styleName,
 				'templateGroupID' => $this->templateGroupID,
 				'isDisabled' => 1, // styles are disabled by default
@@ -478,7 +478,7 @@ class StyleAddForm extends AbstractForm {
 				'license' => $this->license,
 				'authorName' => $this->authorName,
 				'authorURL' => $this->authorURL
-			),
+			)),
 			'tmpHash' => $this->tmpHash,
 			'variables' => $this->variables
 		));
diff --git a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
index 270387ca23..6305de9938 100644
--- a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
@@ -92,7 +92,7 @@ class StyleEditForm extends StyleAddForm {
 		AbstractForm::save();
 		
 		$this->objectAction = new StyleAction(array($this->style), 'update', array(
-			'data' => array(
+			'data' => array_merge($this->additionalFields, array(
 				'styleName' => $this->styleName,
 				'templateGroupID' => $this->templateGroupID,
 				'styleVersion' => $this->styleVersion,
@@ -102,7 +102,7 @@ class StyleEditForm extends StyleAddForm {
 				'license' => $this->license,
 				'authorName' => $this->authorName,
 				'authorURL' => $this->authorURL
-			),
+			)),
 			'tmpHash' => $this->tmpHash,
 			'variables' => $this->variables
 		));
diff --git a/wcfsetup/install/files/lib/acp/form/TagAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TagAddForm.class.php
index 88ba2afc0f..432420ebc4 100644
--- a/wcfsetup/install/files/lib/acp/form/TagAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TagAddForm.class.php
@@ -141,10 +141,10 @@ class TagAddForm extends AbstractForm {
 		parent::save();
 		
 		// save tag
-		$this->objectAction = new TagAction(array(), 'create', array('data' => array(
+		$this->objectAction = new TagAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'name' => $this->name,
 			'languageID' => $this->languageID
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$returnValues = $this->objectAction->getReturnValues();
 		$editor = new TagEditor($returnValues['returnValues']);
diff --git a/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
index 48a782f2f7..0788085307 100644
--- a/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
@@ -61,9 +61,9 @@ class TagEditForm extends TagAddForm {
 		AbstractForm::save();
 		
 		// update tag
-		$this->objectAction = new TagAction(array($this->tagID), 'update', array('data' => array(
+		$this->objectAction = new TagAction(array($this->tagID), 'update', array('data' => array_merge($this->additionalFields, array(
 			'name' => $this->name
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		if ($this->tagObj->synonymFor === null) {
diff --git a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
index f238c1827a..40ce50aa59 100644
--- a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php
@@ -187,12 +187,12 @@ class TemplateAddForm extends AbstractForm {
 			$this->application = Package::getAbbreviation(PackageCache::getInstance()->getPackage($this->packageID)->package);
 		}
 		
-		$this->objectAction = new TemplateAction(array(), 'create', array('data' => array(
+		$this->objectAction = new TemplateAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'application' => $this->application,
 			'templateName' => $this->tplName,
 			'packageID' => $this->packageID,
 			'templateGroupID' => $this->templateGroupID
-		), 'source' => $this->templateSource));
+		)), 'source' => $this->templateSource));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php
index 4fde41e0ff..7edd432b59 100644
--- a/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php
@@ -72,11 +72,11 @@ class TemplateEditForm extends TemplateAddForm {
 	public function save() {
 		AbstractForm::save();
 		
-		$this->objectAction = new TemplateAction(array($this->template), 'update', array('data' => array(
+		$this->objectAction = new TemplateAction(array($this->template), 'update', array('data' => array_merge($this->additionalFields, array(
 			'templateName' => $this->tplName,
 			'templateGroupID' => $this->templateGroupID,
 			'lastModificationTime' => TIME_NOW
-		), 'source' => $this->templateSource));
+		)), 'source' => $this->templateSource));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php
index 0ec74cda74..371017879d 100644
--- a/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php
@@ -125,11 +125,11 @@ class TemplateGroupAddForm extends AbstractForm {
 	public function save() {
 		parent::save();
 		
-		$this->objectAction = new TemplateGroupAction(array(), 'create', array('data' => array(
+		$this->objectAction = new TemplateGroupAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'templateGroupName' => $this->templateGroupName,
 			'templateGroupFolderName' => $this->templateGroupFolderName,
 			'parentTemplateGroupID' => ($this->parentTemplateGroupID ?: null)
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php
index 654f95a84c..d70e1d959e 100644
--- a/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php
@@ -72,11 +72,11 @@ class TemplateGroupEditForm extends TemplateGroupAddForm {
 	public function save() {
 		AbstractForm::save();
 		
-		$this->objectAction = new TemplateGroupAction(array($this->templateGroup), 'update', array('data' => array(
+		$this->objectAction = new TemplateGroupAction(array($this->templateGroup), 'update', array('data' => array_merge($this->additionalFields, array(
 			'templateGroupName' => $this->templateGroupName,
 			'templateGroupFolderName' => $this->templateGroupFolderName,
 			'parentTemplateGroupID' => ($this->parentTemplateGroupID ?: null)
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
index cb641659e3..9eb0c143a9 100644
--- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
@@ -82,12 +82,6 @@ class UserAddForm extends UserOptionListForm {
 	 */
 	public $visibleLanguages = array();
 	
-	/**
-	 * additional fields
-	 * @var	array<mixed>
-	 */
-	public $additionalFields = array();
-	
 	/**
 	 * title of the user
 	 * @var	string
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index a1d315fc84..3c225c93d7 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@ -58,12 +58,6 @@ class UserGroupAddForm extends AbstractOptionListForm {
 	 */
 	protected $groupDescription = '';
 	
-	/**
-	 * additional fields
-	 * @var	array
-	 */
-	public $additionalFields = array();
-	
 	/**
 	 * list of values of group 'Anyone'
 	 * @var	array
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
index 43720d2c99..e4f90b7e15 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
@@ -150,13 +150,13 @@ class UserGroupEditForm extends UserGroupAddForm {
 		}
 		
 		$data = array(
-			'data' => array_merge(array(
+			'data' => array_merge($this->additionalFields, array(
 				'groupName' => $this->groupName,
 				'groupDescription' => $this->groupDescription,
 				'priority' => $this->priority,
 				'userOnlineMarking' => $this->userOnlineMarking,
 				'showOnTeamPage' => $this->showOnTeamPage
-			), $this->additionalFields),
+			)),
 			'options' => $optionValues
 		);
 		$this->objectAction = new UserGroupAction(array($this->groupID), 'update', $data);
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
index c518433b57..f9c67cd96a 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
@@ -228,7 +228,7 @@ class UserOptionAddForm extends AbstractForm {
 	public function save() {
 		parent::save();
 		
-		$this->objectAction = new UserOptionAction(array(), 'create', array('data' => array(
+		$this->objectAction = new UserOptionAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'optionName' => StringUtil::getRandomID(),
 			'categoryName' => $this->categoryName,
 			'optionType' => $this->optionType,
@@ -244,7 +244,7 @@ class UserOptionAddForm extends AbstractForm {
 			'visible' => $this->visible,
 			'packageID' => 1,
 			'additionalData' => ($this->optionType == 'select' ? serialize(array('allowEmptyValue' => true)) : '')
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		$returnValues = $this->objectAction->getReturnValues();
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
index 9076d20156..6c7cd060cd 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
@@ -79,11 +79,11 @@ class UserOptionCategoryAddForm extends AbstractForm {
 		parent::save();
 		
 		// save label
-		$this->objectAction = new UserOptionCategoryAction(array(), 'create', array('data' => array(
+		$this->objectAction = new UserOptionCategoryAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'parentCategoryName' => 'profile',
 			'categoryName' => $this->categoryName,
 			'showOrder' => $this->showOrder
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		// update name
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
index 26ca2ac0bb..e5c9249f4f 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
@@ -56,9 +56,9 @@ class UserOptionCategoryEditForm extends UserOptionCategoryAddForm {
 		
 		I18nHandler::getInstance()->save('categoryName', 'wcf.user.option.category.'.$this->category->categoryName, 'wcf.user.option');
 		
-		$this->objectAction = new UserOptionCategoryAction(array($this->category), 'update', array('data' => array(
+		$this->objectAction = new UserOptionCategoryAction(array($this->category), 'update', array('data' => array_merge($this->additionalFields, array(
 			'showOrder' => $this->showOrder
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php
index 2a5878266b..541d3b6c15 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php
@@ -57,7 +57,7 @@ class UserOptionEditForm extends UserOptionAddForm {
 		I18nHandler::getInstance()->save('optionName', 'wcf.user.option.'.$this->userOption->optionName, 'wcf.user.option');
 		I18nHandler::getInstance()->save('optionDescription', 'wcf.user.option.'.$this->userOption->optionName.'.description', 'wcf.user.option');
 		
-		$this->objectAction = new UserOptionAction(array($this->userOption), 'update', array('data' => array(
+		$this->objectAction = new UserOptionAction(array($this->userOption), 'update', array('data' => array_merge($this->additionalFields, array(
 			'categoryName' => $this->categoryName,
 			'optionType' => $this->optionType,
 			'defaultValue' => $this->defaultValue,
@@ -70,7 +70,7 @@ class UserOptionEditForm extends UserOptionAddForm {
 			'searchable' => $this->searchable,
 			'editable' => $this->editable,
 			'visible' => $this->visible
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php
index e3239c5e95..e53b81ce2c 100644
--- a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php
@@ -176,7 +176,7 @@ class UserRankAddForm extends AbstractForm {
 		parent::save();
 		
 		// save label
-		$this->objectAction = new UserRankAction(array(), 'create', array('data' => array(
+		$this->objectAction = new UserRankAction(array(), 'create', array('data' => array_merge($this->additionalFields, array(
 			'rankTitle' => $this->rankTitle,
 			'cssClassName' => ($this->cssClassName == 'custom' ? $this->customCssClassName : $this->cssClassName),
 			'groupID' => $this->groupID,
@@ -184,7 +184,7 @@ class UserRankAddForm extends AbstractForm {
 			'rankImage' => $this->rankImage,
 			'repeatImage' => $this->repeatImage,
 			'requiredGender' => $this->requiredGender
-		)));
+		))));
 		$this->objectAction->executeAction();
 		
 		if (!I18nHandler::getInstance()->isPlainValue('rankTitle')) {
diff --git a/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php
index c6d8972c9f..d6060fc176 100644
--- a/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php
@@ -64,7 +64,7 @@ class UserRankEditForm extends UserRankAddForm {
 		}
 		
 		// update label
-		$this->objectAction = new UserRankAction(array($this->rank), 'update', array('data' => array(
+		$this->objectAction = new UserRankAction(array($this->rank), 'update', array('data' => array_merge($this->additionalFields, array(
 			'rankTitle' => $this->rankTitle,
 			'cssClassName' => ($this->cssClassName == 'custom' ? $this->customCssClassName : $this->cssClassName),
 			'groupID' => $this->groupID,
@@ -72,7 +72,7 @@ class UserRankEditForm extends UserRankAddForm {
 			'rankImage' => $this->rankImage,
 			'repeatImage' => $this->repeatImage,
 			'requiredGender' => $this->requiredGender
-		)));
+		))));
 		$this->objectAction->executeAction();
 		$this->saved();
 		
diff --git a/wcfsetup/install/files/lib/form/AbstractForm.class.php b/wcfsetup/install/files/lib/form/AbstractForm.class.php
index 39b06e1687..5f57f2895c 100644
--- a/wcfsetup/install/files/lib/form/AbstractForm.class.php
+++ b/wcfsetup/install/files/lib/form/AbstractForm.class.php
@@ -42,6 +42,12 @@ abstract class AbstractForm extends AbstractPage implements IForm {
 	 */
 	public $objectAction = null;
 	
+	/**
+	 * additional fields
+	 * @var	array<mixed>
+	 */
+	public $additionalFields = array();
+	
 	/**
 	 * @see	\wcf\form\IForm::submit()
 	 */
diff --git a/wcfsetup/install/files/lib/form/AccountManagementForm.class.php b/wcfsetup/install/files/lib/form/AccountManagementForm.class.php
index d7aaa0b680..04cb78fc96 100644
--- a/wcfsetup/install/files/lib/form/AccountManagementForm.class.php
+++ b/wcfsetup/install/files/lib/form/AccountManagementForm.class.php
@@ -433,7 +433,7 @@ class AccountManagementForm extends AbstractForm {
 		
 		$data = array();
 		if (!empty($updateParameters)) {
-			$data['data'] = $updateParameters;
+			$data['data'] = array_merge($this->additionalFields, $updateParameters);
 		}
 		if (!empty($updateOptions)) {
 			$data['options'] = $updateOptions;
diff --git a/wcfsetup/install/files/lib/form/AvatarEditForm.class.php b/wcfsetup/install/files/lib/form/AvatarEditForm.class.php
index 80b25b40c1..8e94e2b287 100644
--- a/wcfsetup/install/files/lib/form/AvatarEditForm.class.php
+++ b/wcfsetup/install/files/lib/form/AvatarEditForm.class.php
@@ -2,7 +2,7 @@
 namespace wcf\form;
 use wcf\data\user\avatar\Gravatar;
 use wcf\data\user\avatar\UserAvatarAction;
-use wcf\data\user\UserEditor;
+use wcf\data\user\UserAction;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\menu\user\UserMenu;
@@ -97,28 +97,29 @@ class AvatarEditForm extends AbstractForm {
 		// update user
 		switch ($this->avatarType) {
 			case 'none':
-				$editor = new UserEditor(WCF::getUser());
-				$editor->update(array(
+				$data = array(
 					'avatarID' => null,
 					'enableGravatar' => 0
-				));
+				);
 			break;
 				
 			case 'custom':
-				$editor = new UserEditor(WCF::getUser());
-				$editor->update(array(
+				$data = array(
 					'enableGravatar' => 0
-				));
+				);
 			break;
 				
 			case 'gravatar':
-				$editor = new UserEditor(WCF::getUser());
-				$editor->update(array(
+				$data = array(
 					'avatarID' => null,
 					'enableGravatar' => 1
-				));
+				);
 			break;
 		}
+		$this->objectAction = new UserAction(array(WCF::getUser()), 'update', array(
+			'data' => array_merge($this->additionalFields, $data)
+		));
+		$this->objectAction->executeAction();
 		
 		$this->saved();
 		WCF::getTPL()->assign('success', true);
diff --git a/wcfsetup/install/files/lib/form/EmailActivationForm.class.php b/wcfsetup/install/files/lib/form/EmailActivationForm.class.php
index 67bd205e21..129b35c61f 100644
--- a/wcfsetup/install/files/lib/form/EmailActivationForm.class.php
+++ b/wcfsetup/install/files/lib/form/EmailActivationForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\form;
 use wcf\data\user\User;
-use wcf\data\user\UserEditor;
+use wcf\data\user\UserAction;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\NamedUserException;
 use wcf\system\exception\UserInputException;
@@ -66,7 +66,7 @@ class EmailActivationForm extends AbstractForm {
 		parent::validate();
 		
 		// check given user id
-		$this->user = new UserEditor(new User($this->userID));
+		$this->user = new User($this->userID);
 		if (!$this->user->userID) {
 			throw new UserInputException('u', 'notValid');
 		}
@@ -94,11 +94,14 @@ class EmailActivationForm extends AbstractForm {
 		parent::save();
 		
 		// enable new email
-		$this->user->update(array(
-			'email' => $this->user->newEmail,
-			'newEmail' => '',
-			'reactivationCode' => 0
+		$this->objectAction = new UserAction(array($this->user), 'update', array(
+			'data' => array_merge($this->additionalFields, array(
+				'email' => $this->user->newEmail,
+				'newEmail' => '',
+				'reactivationCode' => 0
+			))
 		));
+		$this->objectAction->executeAction();
 		$this->saved();
 		
 		// forward to index page
diff --git a/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php b/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php
index 7a437474c1..32c3f39b44 100644
--- a/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php
+++ b/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\form;
 use wcf\data\user\User;
-use wcf\data\user\UserEditor;
+use wcf\data\user\UserAction;
 use wcf\system\exception\UserInputException;
 use wcf\system\mail\Mail;
 use wcf\system\request\LinkHandler;
@@ -59,8 +59,12 @@ class EmailNewActivationCodeForm extends RegisterNewActivationCodeForm {
 		$activationCode = UserRegistrationUtil::getActivationCode();
 		
 		// save user
-		$userEditor = new UserEditor($this->user);
-		$userEditor->update(array('reactivationCode' => $activationCode));
+		$this->objectAction = new UserAction(array($this->user), 'update', array(
+			'data' => array_merge($this->additionalFields, array(
+				'reactivationCode' => $activationCode
+			))
+		));
+		$this->objectAction->executeAction();
 		
 		// send activation mail
 		$messageData = array(
diff --git a/wcfsetup/install/files/lib/form/LostPasswordForm.class.php b/wcfsetup/install/files/lib/form/LostPasswordForm.class.php
index 883a31478a..322fb54847 100644
--- a/wcfsetup/install/files/lib/form/LostPasswordForm.class.php
+++ b/wcfsetup/install/files/lib/form/LostPasswordForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\form;
 use wcf\data\user\User;
-use wcf\data\user\UserEditor;
+use wcf\data\user\UserAction;
 use wcf\system\exception\NamedUserException;
 use wcf\system\exception\UserInputException;
 use wcf\system\mail\Mail;
@@ -105,11 +105,13 @@ class LostPasswordForm extends RecaptchaForm {
 		$lostPasswordKey = StringUtil::getRandomID();
 		
 		// save key and request time in database
-		$userEditor = new UserEditor($this->user);
-		$userEditor->update(array(
-			'lostPasswordKey' => $lostPasswordKey,
-			'lastLostPasswordRequestTime' => TIME_NOW
+		$this->objectAction = new UserAction(array($this->user), 'update', array(
+			'data' => array_merge($this->additionalFields, array(
+				'lostPasswordKey' => $lostPasswordKey,
+				'lastLostPasswordRequestTime' => TIME_NOW
+			))
 		));
+		$this->objectAction->executeAction();
 		
 		// send mail
 		$mail = new Mail(array($this->user->username => $this->user->email), WCF::getLanguage()->getDynamicVariable('wcf.user.lostPassword.mail.subject'), WCF::getLanguage()->getDynamicVariable('wcf.user.lostPassword.mail', array(
diff --git a/wcfsetup/install/files/lib/form/NewPasswordForm.class.php b/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
index 9319ed5022..ec5fd7289f 100644
--- a/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
+++ b/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\form;
 use wcf\data\user\User;
-use wcf\data\user\UserEditor;
+use wcf\data\user\UserAction;
 use wcf\page\AbstractPage;
 use wcf\system\exception\UserInputException;
 use wcf\system\mail\Mail;
@@ -94,12 +94,14 @@ class NewPasswordForm extends AbstractForm {
 		$this->newPassword = PasswordUtil::getRandomPassword((REGISTER_PASSWORD_MIN_LENGTH > 9 ? REGISTER_PASSWORD_MIN_LENGTH : 9));
 		
 		// update user
-		$userEditor = new UserEditor($this->user);
-		$userEditor->update(array(
-			'password' => $this->newPassword,
-			'lastLostPasswordRequestTime' => 0,
-			'lostPasswordKey' => ''
+		$this->objectAction = new UserAction(array($this->user), 'update', array(
+			'data' => array_merge($this->additionalFields, array(
+				'password' => $this->newPassword,
+				'lastLostPasswordRequestTime' => 0,
+				'lostPasswordKey' => ''
+			))
 		));
+		$this->objectAction->executeAction();
 		
 		// send mail
 		$mail = new Mail(array($this->user->username => $this->user->email), WCF::getLanguage()->getDynamicVariable('wcf.user.newPassword.mail.subject'), WCF::getLanguage()->getDynamicVariable('wcf.user.newPassword.mail', array(
diff --git a/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php b/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php
index b33073ab5b..11446b86ce 100644
--- a/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php
+++ b/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\form;
 use wcf\data\user\User;
-use wcf\data\user\UserEditor;
+use wcf\data\user\UserAction;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\UserInputException;
 use wcf\system\mail\Mail;
@@ -132,10 +132,12 @@ class RegisterNewActivationCodeForm extends AbstractForm {
 		$activationCode = UserRegistrationUtil::getActivationCode();
 		
 		// save user
-		$userEditor = new UserEditor($this->user);
 		$parameters = array('activationCode' => $activationCode);
 		if (!empty($this->email)) $parameters['email'] = $this->email;
-		$userEditor->update($parameters);
+		$this->objectAction = new UserAction(array($this->user), 'update', array(
+			'data' => array_merge($this->additionalFields, $parameters)
+		));
+		$this->objectAction->executeAction();
 		
 		// reload user to reflect changes
 		$this->user = new User($this->user->userID);
diff --git a/wcfsetup/install/files/lib/form/SettingsForm.class.php b/wcfsetup/install/files/lib/form/SettingsForm.class.php
index 0b2697ca1a..7cb5e9830a 100644
--- a/wcfsetup/install/files/lib/form/SettingsForm.class.php
+++ b/wcfsetup/install/files/lib/form/SettingsForm.class.php
@@ -192,10 +192,10 @@ class SettingsForm extends AbstractForm {
 		$parameters = array('options' => $saveOptions);
 		// static options
 		if ($this->category == 'general') {
-			$parameters['data'] = array(
+			$parameters['data'] = array_merge($this->additionalFields, array(
 				'languageID' => $this->languageID,
 				'styleID' => $this->styleID
-			);
+			));
 			$parameters['languageIDs'] = $this->contentLanguageIDs;
 		}
 		
diff --git a/wcfsetup/install/files/lib/form/SignatureEditForm.class.php b/wcfsetup/install/files/lib/form/SignatureEditForm.class.php
index 6c57431419..835e11ec30 100644
--- a/wcfsetup/install/files/lib/form/SignatureEditForm.class.php
+++ b/wcfsetup/install/files/lib/form/SignatureEditForm.class.php
@@ -143,12 +143,12 @@ class SignatureEditForm extends MessageForm {
 		parent::save();
 		
 		$this->objectAction = new UserAction(array(WCF::getUser()), 'update', array(
-			'data' => array(
+			'data' => array_merge($this->additionalFields, array(
 				'signature' => $this->text,
 				'signatureEnableBBCodes' => $this->enableBBCodes,
 				'signatureEnableHtml' => $this->enableHtml,
 				'signatureEnableSmilies' => $this->enableSmilies
-			)
+			))
 		));
 		$this->objectAction->executeAction();
 		SignatureCache::getInstance()->getSignature(new User(WCF::getUser()->userID));