clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4468 from annando/issue-4396 

Issue 4396: Avoid SQL error during UImport
This commit is contained in:
Hypolite Petovan 2018-02-17 09:08:12 -05:00 committed by GitHub
parent 35974a9c7b d119beef3f
commit 07c35935f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
} }