strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7258 from annando/fix-notice

Browse source 
Fix notice in Model\Profile
This commit is contained in:
Hypolite Petovan 2019-06-12 16:19:45 -04:00 committed by GitHub
parent fb63274aaf 422ebb5d58
commit bb0cf09057
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Model/Profile.php
View file

@ -117,6 +117,11 @@ class Profile
} }
if (count($profiledata) > 0) { if (count($profiledata) > 0) {
// Ensure to have a "nickname" field
if (empty($profiledata['nickname']) && !empty($profiledata['nick'])) {
$profiledata['nickname'] = $profiledata['nick'];
}
// Add profile data to sidebar // Add profile data to sidebar
$a->page['aside'] .= self::sidebar($a, $profiledata, true, $show_connect); $a->page['aside'] .= self::sidebar($a, $profiledata, true, $show_connect);
@ -317,12 +322,12 @@ class Profile
$visitor_contact = []; $visitor_contact = [];
if ($profile['uid'] && self::getMyURL()) { if (!empty($profile['uid']) && self::getMyURL()) {
$visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]); $visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
} }
$profile_contact = []; $profile_contact = [];
if ($profile['cid'] && self::getMyURL()) { if (!empty($profile['cid']) && self::getMyURL()) {
$profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]); $profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]);
} }