From 3e5c3dce01ee56ec51d7bfa4e687c4e2f86d9388 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 24 Apr 2020 12:24:10 +0000 Subject: [PATCH] Next join replaced by view --- src/Protocol/Diaspora.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 513cd0bcc0..19ef391a0a 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -4170,20 +4170,11 @@ class Diaspora */ private static function createProfileData($uid) { - $r = q( - "SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr` - FROM `profile` - INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` - INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid` - WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1", - intval($uid) - ); - - if (!$r) { + $profile = DBA::selectFirst('owner-view', ['uid', 'addr', 'name', 'location', 'net-publish', 'dob', 'about', 'pub_keywords'], ['uid' => $uid]); + if (!DBA::isResult($profile)) { return []; } - $profile = $r[0]; $handle = $profile["addr"]; $split_name = self::splitName($profile['name']); @@ -4212,7 +4203,7 @@ class Diaspora $about = BBCode::toMarkdown($profile['about']); - $location = Profile::formatLocation($profile); + $location = $profile['location']; $tags = ''; if ($profile['pub_keywords']) { $kw = str_replace(',', ' ', $profile['pub_keywords']); -- 2.39.5