https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
835ebd4
)
Fix a notice about a missing "pending"
author
Michael
<heluecht@pirati.ca>
Wed, 11 Sep 2019 20:03:29 +0000
(20:03 +0000)
committer
Michael
<heluecht@pirati.ca>
Wed, 11 Sep 2019 20:03:29 +0000
(20:03 +0000)
src/Model/Contact.php
patch
|
blob
|
history
diff --git
a/src/Model/Contact.php
b/src/Model/Contact.php
index
d4e18ed
..
542ae95
100644
(file)
--- a/
src/Model/Contact.php
+++ b/
src/Model/Contact.php
@@
-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;
$profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url'];
} else {
$sparkle = true;
$profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url'];
} 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']]);
if (DBA::isResult($intro)) {
$menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true];
$intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]);
if (DBA::isResult($intro)) {
$menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true];