clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7617 from annando/notice 

Fix a notice about a missing "pending"
This commit is contained in:
Hypolite Petovan 2019-09-11 16:19:12 -04:00 committed by GitHub
parent 835ebd4777 4223011a7d
commit 981a808873
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/Contact.php
View File

@ -1175,7 +1175,7 @@ class Contact extends BaseObject
} }
$sparkle = false; $sparkle = false;
if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && !$contact['pending']) { if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
$sparkle = true; $sparkle = true;
$profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url']; $profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url'];
} else { } else {
@ -1192,11 +1192,11 @@ class Contact extends BaseObject
$profile_link = $profile_link . '?tab=profile'; $profile_link = $profile_link . '?tab=profile';
} }
if (self::canReceivePrivateMessages($contact) && !$contact['pending']) { if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {
$pm_url = System::baseUrl() . '/message/new/' . $contact['id']; $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
} }
if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && !$contact['pending']) { if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
$poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id']; $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
} }
@ -1232,7 +1232,7 @@ class Contact extends BaseObject
'poke' => [L10n::t('Poke'), $poke_link, false], 'poke' => [L10n::t('Poke'), $poke_link, false],
]; ];
if ($contact['pending']) { if (!empty($contact['pending'])) {
$intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]); $intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]);
if (DBA::isResult($intro)) { if (DBA::isResult($intro)) {
$menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true]; $menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true];