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 cf81659237c599640ad8b1c2634a7fa319e999de..2e328ecb6ddeea2efa59394184bc5a822fc6888e 100644 (file)
--- 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']);
                        }