Merge remote-tracking branch 'upstream/develop' into more-abstraction

[friendica-addons.git] / mailstream / mailstream.php

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 6c057b21b9bfa15aa1d65605242c350854b1f923..cf2fcc84852ebc96d36e23b4bafcccf270c8ff51 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Util\Network;
+use Friendica\Model\Item;
 
 function mailstream_install() {
        Addon::registerHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
@@ -335,8 +336,7 @@ function mailstream_cron($a, $b) {
                if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
                        logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_NORMAL);
                }
-               $items = q('SELECT * FROM `item` WHERE `id` = %d', $ms_item_id['id']);
-               $item = $items[0];
+               $item = Item::selectFirst([], ['id' => $ms_item_id['id']]);
                $users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid']));
                $user = $users[0];
                if ($user && $item) {