Notices again (#5543)

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

diff --git a/src/Model/User.php b/src/Model/User.php
index bebfce3e0059f0c323a28b3b1d516eb68e95e22f..3fbbc6e86b13496f27e86595451ff20e4ddc386e 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -14,7 +14,6 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
@@ -38,7 +37,7 @@ class User
         * @return boolean|array
         */
        public static function getOwnerDataById($uid) {
-               $r = DBA::fetch_first("SELECT
+               $r = DBA::fetchFirst("SELECT
                        `contact`.*,
                        `user`.`prvkey` AS `uprvkey`,
                        `user`.`timezone`,
@@ -56,7 +55,7 @@ class User
                        LIMIT 1",
                        $uid
                );
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return false;
                }
                return $r;
@@ -71,7 +70,7 @@ class User
        public static function getOwnerDataByNick($nick)
        {
                $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
-               if (!DBM::is_result($user)) {
+               if (!DBA::isResult($user)) {
                        return false;
                }
                return self::getOwnerDataById($user['uid']);
@@ -99,7 +98,7 @@ class User
 
                $user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);
 
-               if (DBM::is_result($user)) {
+               if (DBA::isResult($user)) {
                        $default_group = $user["def_gid"];
                }
 
@@ -215,7 +214,7 @@ class User
                                $user = DBA::selectFirst('user', $fields, $condition);
                        }
 
-                       if (!DBM::is_result($user)) {
+                       if (!DBA::isResult($user)) {
                                throw new Exception(L10n::t('User not found'));
                        }
                }
@@ -730,7 +729,8 @@ class User
                Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
 
                // Send an update to the directory
-               Worker::add(PRIORITY_LOW, "Directory", $user['url']);
+               $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
+               Worker::add(PRIORITY_LOW, "Directory", $self['url']);
 
                if ($uid == local_user()) {
                        unset($_SESSION['authenticated']);