From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 12 Jul 2013 17:08:44 +0000 (+0200)
Subject: Fixed user import
X-Git-Tag: 2.0.0_Beta_5~64
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2ee98cb7d72c2e518485dcc06b1cf402863df350;p=GitHub%2FWoltLab%2FWCF.git

Fixed user import
---

diff --git a/wcfsetup/install/files/lib/system/importer/UserImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserImporter.class.php
index cf81659237..2e328ecb6d 100644
--- a/wcfsetup/install/files/lib/system/importer/UserImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/UserImporter.class.php
@@ -24,7 +24,7 @@ class UserImporter implements IImporter {
 		// resolve duplicates
 		$existingUser = User::getUserByUsername($data['username']);
 		if ($existingUser->userID) {
-			if ($this->userMergeMode == 1 || ($this->userMergeMode == 3 && StringUtil::toLowerCase($existingUser->email) != StringUtil::toLowerCase($data['email']))) {
+			if (ImportHandler::getInstance()->getUserMergeMode() == 1 || (ImportHandler::getInstance()->getUserMergeMode() == 3 && StringUtil::toLowerCase($existingUser->email) != StringUtil::toLowerCase($data['email']))) {
 				// rename user
 				$data['username'] = self::resolveDuplicate($data['username']);
 			}