From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 8 Aug 2013 12:31:45 +0000 (-0700)
Subject: Merge pull request #1413 from NurPech/master
X-Git-Tag: 2.0.0_Beta_7~44^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=54af92bb12202d84467ea6dd835a5c803c94d54b;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #1413 from NurPech/master

added support for additional data in data exporter
---

54af92bb12202d84467ea6dd835a5c803c94d54b
diff --cc wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
index 3046fe843e,34db5c504a..6305c40eae
--- a/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()
  	 */