From 422ebb5d58609e436169b493bcb40212ee2aad8e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 12 Jun 2019 19:41:15 +0000 Subject: [PATCH] Fix notice in Model\Profile --- src/Model/Profile.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index f78edb5bd0..868cc6b70a 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -117,6 +117,11 @@ class Profile } 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 $a->page['aside'] .= self::sidebar($a, $profiledata, true, $show_connect); @@ -317,12 +322,12 @@ class Profile $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())]); } $profile_contact = []; - if ($profile['cid'] && self::getMyURL()) { + if (!empty($profile['cid']) && self::getMyURL()) { $profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]); }