Use getByNickname as suggested in code review.

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index f328453e9b52f3df5a2e657f91a2cb21b97b2b5b..74549299439304f511ae7ba90f3d65fae5833162 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -145,7 +145,7 @@ class Profile
         */
        public static function load(App $a, $nickname, array $profiledata = [], $show_connect = true)
        {
-               $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
+               $user = User::getByNickname($nickname);
 
                if (!DBA::isResult($user) && empty($profiledata)) {
                        Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@@ -166,7 +166,16 @@ class Profile
                        }
                }
 
-               $profile = !empty($user['uid']) ? User::getOwnerDataById($user['uid'], false) : [];
+               if (empty($user['uid'])) {
+                       $profile = [];
+               } else {
+                       $profile = array_merge(
+                               $user,
+                               Profile::getByUID($user['uid']),
+                               Contact::getById(Contact::getIdForURL(Strings::normaliseLink(DI::baseurl() . '/profile/' . $nickname), local_user()))
+                       );
+                       $profile['cid'] = $profile['id'];
+               }
 
                if (empty($profile) && empty($profiledata)) {
                        Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@@ -334,7 +343,7 @@ class Profile
 
                        if (Contact::canReceivePrivateMessages($profile)) {
                                if ($visitor_is_followed || $visitor_is_following) {
-                                       $wallmessage_link = $visitor_base_path . '/message/new/' . base64_encode($profile['addr'] ?? '');
+                                       $wallmessage_link = $visitor_base_path . '/message/new/' . $profile['cid'];
                                } elseif ($visitor_is_authenticated && !empty($profile['unkmail'])) {
                                        $wallmessage_link = 'wallmessage/' . $profile['nickname'];
                                }
@@ -412,7 +421,12 @@ class Profile
                        }
                }
 
-               $p = [];
+               // Expected profile/vcard.tpl profile.* template variables
+               $p = [
+                       'address' => null,
+                       'edit' => null,
+                       'upubkey' => null,
+               ];
                foreach ($profile as $k => $v) {
                        $k = str_replace('-', '_', $k);
                        $p[$k] = $v;