bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

And some more view calls added

Browse source
This commit is contained in:
Michael 2020-04-24 12:59:19 +00:00
parent 3e5c3dce01
commit c4f7f3e26e
3 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/display.php
View file

@ -116,11 +116,7 @@ function display_init(App $a)
$nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url'])); $nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) { if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) {
$profile = DBA::fetchFirst("SELECT `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname]);
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `contact`.`self` LIMIT 1",
$nickname
);
if (DBA::isResult($profile)) { if (DBA::isResult($profile)) {
$profiledata = $profile; $profiledata = $profile;
} }

20
src/Model/Profile.php
View file

@ -234,19 +234,7 @@ class Profile
*/ */
public static function getByNickname($nickname, $uid = 0) public static function getByNickname($nickname, $uid = 0)
{ {
$profile = DBA::fetchFirst( $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname, 'uid' => $uid]);
"SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
`profile`.*,
`contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.*
FROM `profile`
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `profile`.`uid` = ? LIMIT 1",
$nickname,
intval($uid)
);
return $profile; return $profile;
} }
@ -399,9 +387,9 @@ class Profile
'fullname' => $profile['name'], 'fullname' => $profile['name'],
'firstname' => $firstname, 'firstname' => $firstname,
'lastname' => $lastname, 'lastname' => $lastname,
'photo300' => $profile['contact_photo'] ?? '', 'photo300' => $profile['photo'] ?? '',
'photo100' => $profile['contact_thumb'] ?? '', 'photo100' => $profile['thumb'] ?? '',
'photo50' => $profile['contact_micro'] ?? '', 'photo50' => $profile['micro'] ?? '',
]; ];
} else { } else {
$diaspora = false; $diaspora = false;

2
static/dbview.config.php
View file

@ -103,6 +103,8 @@ return [
"name-date" => ["contact", "name-date"], "name-date" => ["contact", "name-date"],
"uri-date" => ["contact", "uri-date"], "uri-date" => ["contact", "uri-date"],
"avatar-date" => ["contact", "avatar-date"], "avatar-date" => ["contact", "avatar-date"],
"contact_id" => ["contact", "id"], /// @todo Replaces all uses of "contact_id" with "id"
"picdate" => ["contact", "avatar-date"], /// @todo Replaces all uses of "picdate" with "avatar-date"
"term-date" => ["contact", "term-date"], "term-date" => ["contact", "term-date"],
"last-item" => ["contact", "last-item"], "last-item" => ["contact", "last-item"],
"lastitem_date" => ["contact", "last-item"], /// @todo Replaces all uses of "lastitem_date" with "last-item" "lastitem_date" => ["contact", "last-item"], /// @todo Replaces all uses of "lastitem_date" with "last-item"