From 366fbbd3e11754c64a2b08cbae935b7ba42ff21a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 3 Oct 2021 21:58:05 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Hypolite Petovan --- mailstream/mailstream.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index d2e17410..8c7d213c 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -439,10 +439,9 @@ function mailstream_html_wrap(&$text) */ function mailstream_convert_table_entries() { - $ms_item_ids = DBA::selectToArray('mailstream_item', ['message-id', 'uri', 'uid', 'contact-id'], ["`mailstream_item`.`completed` IS NULL"]); - if (DBA::isResult($ms_item_ids)) { - Logger::debug('mailstream_convert_table_entries processing ' . count($ms_item_ids) . ' items'); - foreach ($ms_item_ids as $ms_item_id) { + $ms_item_ids = DBA::selectToArray('mailstream_item', [], ['message-id', 'uri', 'uid', 'contact-id'], ["`mailstream_item`.`completed` IS NULL"]); + Logger::debug('mailstream_convert_table_entries processing ' . count($ms_item_ids) . ' items'); + foreach ($ms_item_ids as $ms_item_id) { $send_hook_data = array('uid' => $ms_item_id['uid'], 'contact-id' => $ms_item_id['contact-id'], 'uri' => $ms_item_id['uri'], @@ -454,8 +453,7 @@ function mailstream_convert_table_entries() continue; } Logger::info('mailstream_convert_table_entries: convert item to workerqueue', $send_hook_data); - Hook::fork(PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data); - } + Hook::fork(PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data); } DBA::e('DROP TABLE `mailstream_item`'); } -- 2.39.5