https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button
[friendica.git/.git]
/
src
/
Model
/
Contact.php
diff --git
a/src/Model/Contact.php
b/src/Model/Contact.php
index
73118be
..
01bbd23
100644
(file)
--- a/
src/Model/Contact.php
+++ b/
src/Model/Contact.php
@@
-2171,7
+2171,8
@@
class Contact extends BaseObject
if (!empty($contact)) {
// Contact is blocked at user-level
if (!empty($contact)) {
// Contact is blocked at user-level
- if (self::isBlockedByUser($contact['id'], $importer['id'])) {
+ if (!empty($contact['id']) && !empty($importer['id']) &&
+ self::isBlockedByUser($contact['id'], $importer['id'])) {
return false;
}
return false;
}