keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue 4396: Avoid SQL error during UImport

Browse source
This commit is contained in:
Michael 2018-02-17 10:37:14 +00:00
parent 753f92c234
commit d119beef3f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/UserImport.php
View file

@ -114,7 +114,7 @@ class UserImport
// check for username // check for username
// check if username matches deleted account // check if username matches deleted account
if (dba::exists('user', ['nickname' => $account['user']['nickname']]) 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'])); notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
return; return;
} }