Add missing usage of additionalFields in form classes

diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php
index 983c67199262dff34f3ab60786712cd1e6e40357..9cba954065d4b0313681dd8fe4a6a90a5686fc94 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php
@@ -237,7 +237,7 @@ abstract class AbstractCategoryAddForm extends AbstractForm {
                parent::save();
                
                $this->objectAction = new CategoryAction(array(), 'create', array(
-                       'data' => array(
+                       'data' => array_merge($this->additionalFields, array(
                                'additionalData' => serialize($this->additionalData),
                                'description' => ($this->objectType->getProcessor()->hasDescription() && I18nHandler::getInstance()->isPlainValue('description')) ? I18nHandler::getInstance()->getValue('description') : '',
                                'isDisabled' => $this->isDisabled,
@@ -245,7 +245,7 @@ abstract class AbstractCategoryAddForm extends AbstractForm {
                                'parentCategoryID' => $this->parentCategoryID,
                                'showOrder' => $this->showOrder > 0 ? $this->showOrder : null,
                                'title' => I18nHandler::getInstance()->isPlainValue('title') ? I18nHandler::getInstance()->getValue('title') : ''
-                       )
+                       ))
                ));
                $this->objectAction->executeAction();
                $returnValues = $this->objectAction->getReturnValues();

diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php
index 828fb1dcceaf0aafff96d775b2262d9e0fad4295..2d9da1c5ac3697b24e52347c7ed6619bae656953 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php
@@ -133,14 +133,14 @@ class AbstractCategoryEditForm extends AbstractCategoryAddForm {
                
                // update category
                $this->objectAction = new CategoryAction(array($this->category), 'update', array(
-                       'data' => array(
+                       'data' => array_merge($this->additionalFields, array(
                                'additionalData' => serialize($this->additionalData),
                                'description' => $description,
                                'isDisabled' => $this->isDisabled,
                                'parentCategoryID' => $this->parentCategoryID,
                                'showOrder' => $this->showOrder,
                                'title' => $title
-                       )
+                       ))
                ));
                $this->objectAction->executeAction();