https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
753f92c
)
Issue 4396: Avoid SQL error during UImport
author
Michael
<heluecht@pirati.ca>
Sat, 17 Feb 2018 10:37:14 +0000
(10:37 +0000)
committer
Michael
<heluecht@pirati.ca>
Sat, 17 Feb 2018 10:37:14 +0000
(10:37 +0000)
src/Core/UserImport.php
patch
|
blob
|
history
diff --git
a/src/Core/UserImport.php
b/src/Core/UserImport.php
index
801deda
..
0832dae
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', ['
nick
name' => $account['user']['nickname']])) {
+ || dba::exists('userd', ['
user
name' => $account['user']['nickname']])) {
notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
return;
}