Merge pull request #1413 from NurPech/master

added support for additional data in data exporter

diff --cc wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
index 3046fe843e59611657479fcbb3082343369a5bf2,34db5c504a9c049c21d1eb55932a175d6267c730..6305c40eae87ac6b393a4f0da67f4fa308a8fbe1
--- 1/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
--- 2/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
@@@ -215,23 -223,13 +223,24 @@@ class DataImportForm extends AbstractFo
                        'dbName' => $this->dbName,
                        'dbPrefix' => $this->dbPrefix,
                        'fileSystemPath' => $this->fileSystemPath,
-                       'userMergeMode' => $this->userMergeMode
+                       'userMergeMode' => $this->userMergeMode,
+                       'additionalData' => $this->additionalData
                ));
-               
+ 
                WCF::getTPL()->assign('queue', $queue);
        }
-       
+ 
 +      /**
 +       * @see wcf\page\IPage::readData()
 +       */
 +      public function readData() {
 +              parent::readData();
 +              
 +              if (!count($_POST)) {
 +                      $this->fileSystemPath = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : WCF_DIR);
 +              }
 +      }
 +      
        /**
         * @see wcf\page\IPage::assignVariables()
         */