Merge pull request #4468 from annando/issue-4396

Issue 4396: Avoid SQL error during UImport

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 801deda0af2c26c453bc417fb473167937c392d8..0832dae45a49453398d0c241b3800c56f056ad3b 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -114,7 +114,7 @@ class UserImport
                // check for username
                // check if username matches deleted account
                if (dba::exists('user', ['nickname' => $account['user']['nickname']])
-                       || dba::exists('userd', ['nickname' => $account['user']['nickname']])) {
+                       || dba::exists('userd', ['username' => $account['user']['nickname']])) {
                        notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
                        return;
                }