Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 02:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix various Notices

Browse source
This commit is contained in:
Philipp 2021-09-13 20:22:55 +02:00
parent 9b19fb9b4d
commit 644f312896
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
7 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -2757,12 +2757,14 @@ class Contact
return null;
}
public static function removeFollower($importer, $contact)
public static function removeFollower(array $contact)
{
if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) {
if (!empty($contact['rel']) && (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING))) {
DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
} else {
} elseif (!empty($contact['id'])) {
self::remove($contact['id']);
} else {
DI::logger()->info('Couldn\'t remove follower because of invalid contact array', ['contact' => $contact]);
}
}

4
src/Model/Item.php
View file

@ -2292,9 +2292,9 @@ class Item
continue;
} elseif (!$expire_starred && intval($item['starred'])) {
continue;
} elseif (!$expire_notes && ($item['post-type'] == self::PT_PERSONAL_NOTE)) {
} elseif (!$expire_notes && (($item['post-type'] ?? null) == self::PT_PERSONAL_NOTE)) {
continue;
} elseif (!$expire_items && ($item['post-type'] != self::PT_PERSONAL_NOTE)) {
} elseif (!$expire_items && (($item['post-type'] ?? null) != self::PT_PERSONAL_NOTE)) {
continue;
}