Add possibility to upload smiley file when adding new smiley

[GitHub/WoltLab/WCF.git] / wcfsetup / install / files / lib / acp / form / SmileyEditForm.class.php

diff --git a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
index 79e1e7c40160cfd5dfd2ff0c100156f35b71b24d..b1c5e4fab477ccbd7c911d76471ea723e2b265a9 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
@@ -69,16 +69,21 @@ class SmileyEditForm extends SmileyAddForm {
                }
                
                // update bbcode
-               $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 = 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
+                       )),
+                       'fileLocation' => $this->uploadedFilename ? WCF_DIR.'images/smilies/tmp/'.$this->uploadedFilename : ''
+               ));
                $this->objectAction->executeAction();
                
+               $this->uploadedFilename = '';
+               
                $this->saved();
                
                // show success