Merge remote-tracking branch 'upstream/develop' into restricted

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index 3505f3b7affc27325bb8318d29d693d74243d59a..79e23863812da56d02cfdf98ec849d8855a62d86 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -280,7 +280,7 @@ class User
                // List of possible actor names
                $possible_accounts = ['friendica', 'actor', 'system', 'internal'];
                foreach ($possible_accounts as $name) {
-                       if (!DBA::exists('user', ['nickname' => $name]) && DBA::exists('userd', ['username' => $name])) {
+                       if (!DBA::exists('user', ['nickname' => $name]) && !DBA::exists('userd', ['username' => $name])) {
                                DI::config()->set('system', 'actor_name', $name);
                                return $name;
                        }