From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 6 Jul 2015 16:27:37 +0000 (+0200)
Subject: Fixed missing default values in data import form
X-Git-Tag: 2.1.6~17
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a311c8355452be823fe326566b8d6bad5b973db5;p=GitHub%2FWoltLab%2FWCF.git

Fixed missing default values in data import form
---

diff --git a/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php b/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
index 8f04f45bdd..3b11b41af9 100644
--- a/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
@@ -167,7 +167,7 @@ class DataImportForm extends AbstractForm {
 			}
 			
 			// get default database prefix
-			if (!count($_POST)) {
+			if (!isset($_POST['dbPrefix'])) {
 				$this->dbPrefix = $this->exporter->getDefaultDatabasePrefix();
 			}
 		}
@@ -268,9 +268,9 @@ class DataImportForm extends AbstractForm {
 	public function readData() {
 		parent::readData();
 		
+		if (!isset($_POST['fileSystemPath'])) $this->fileSystemPath = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : WCF_DIR);
+		
 		if (empty($_POST)) {
-			$this->fileSystemPath = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : WCF_DIR);
-			
 			if (!$this->exporterName) {
 				$sql = "SELECT	COUNT(*) AS count
 					FROM	wcf".WCF_N."_import_mapping";