Merge pull request #10807 from annando/emoji-media

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 992c8d471077d1f0977cafc128f83691871b2228..fbbd2eb673731b7bfe75e0c98caf35bd397bd79b 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1766,15 +1766,15 @@ class Item
                        } else {
                                $condition = ['id' => $arr['contact-id'], 'self' => false];
                        }
-                       DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
+                       Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
                }
                // Now do the same for the system wide contacts with uid=0
                if ($arr['private'] != self::PRIVATE) {
-                       DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+                       Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
                                ['id' => $arr['owner-id']]);
 
                        if ($arr['owner-id'] != $arr['author-id']) {
-                               DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+                               Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
                                        ['id' => $arr['author-id']]);
                        }
                }
@@ -2292,9 +2292,9 @@ class Item
                                continue;
                        } elseif (!$expire_starred && intval($item['starred'])) {
                                continue;
-                       } elseif (!$expire_notes && (($item['post-type'] ?? null) == self::PT_PERSONAL_NOTE)) {
+                       } elseif (!$expire_notes && ($item['post-type'] == self::PT_PERSONAL_NOTE)) {
                                continue;
-                       } elseif (!$expire_items && (($item['post-type'] ?? null) != self::PT_PERSONAL_NOTE)) {
+                       } elseif (!$expire_items && ($item['post-type'] != self::PT_PERSONAL_NOTE)) {
                                continue;
                        }