Add tests for Network\Probe::getFeedLink

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

diff --git a/src/Model/User.php b/src/Model/User.php
index e7f2f89ad6f09bddcdb568fef7372710a0220f59..b561a7912a8e89efa2ee6398f0b7955b2a8dc9df 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -197,7 +197,11 @@ class User
        {
                $owner = DBA::selectFirst('owner-view', [], ['uid' => $uid]);
                if (!DBA::isResult($owner)) {
-                       return false;
+                       if (!DBA::exists('user', ['uid' => $uid]) || !$check_valid) {
+                               return false;
+                       }
+                       Contact::createSelfFromUserId($uid);
+                       $owner = self::getOwnerDataById($uid, false);
                }
 
                if (empty($owner['nickname'])) {
@@ -1158,7 +1162,7 @@ class User
                // unique), so it cannot be re-registered in the future.
                DBA::insert('userd', ['username' => $user['nickname']]);
 
-               // The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
+               // The user and related data will be deleted in Friendica\Worker\CronJobs::expireAndRemoveUsers()
                DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
                Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::REMOVAL, $uid);
 
@@ -1294,6 +1298,7 @@ class User
                                $statistics['active_users_monthly']++;
                        }
                }
+               DBA::close($userStmt);
 
                return $statistics;
        }