mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 11:23:52 +02:00
Code Issues Projects Releases Wiki Activity

MDL-46881 forum: Ensure that there are posts to remove

Browse Source
This commit is contained in:
Andrew Nicols 2019-01-23 11:15:20 +08:00
parent b231aabb2d
commit c0284ccbc6
2 changed files with 26 additions and 1 deletions

22
mod/forum/classes/task/send_user_digests.php

@ -307,6 +307,12 @@ class send_user_digests extends \core\task\adhoc_task {
}
$posts->close();
if (empty($discussionids)) {
// All posts have been removed since the task was queued.
$this->empty_queue($this->recipient->id, $timenow);
return;
}
list($in, $params) = $DB->get_in_or_equal($discussionids);
$this->discussions = $DB->get_records_select('forum_discussions', "id {$in}", $params);
@ -321,7 +327,21 @@ class send_user_digests extends \core\task\adhoc_task {
$this->fill_digest_cache();
$DB->delete_records_select('forum_queue', "userid = :userid AND timemodified < :timemodified", $queueparams);
$this->empty_queue($this->recipient->id, $timenow);
}
/**
* Empty the queue of posts for this user.
*
* @param array $queueparams The list of
*/
protected function empty_queue(int $userid, int $timemodified) : void {
global $DB;
$DB->delete_records_select('forum_queue', "userid = :userid AND timemodified < :timemodified", [
'userid' => $userid,
'timemodified' => $timemodified,
]);
}
/**

5
mod/forum/classes/task/send_user_notifications.php

@ -213,6 +213,11 @@ class send_user_notifications extends \core\task\adhoc_task {
}
$posts->close();
if (empty($discussionids)) {
// All posts have been removed since the task was queued.
return;
}
// Fetch all discussions.
list($in, $params) = $DB->get_in_or_equal(array_values($discussionids));
$this->discussions = $DB->get_records_select('forum_discussions', "id {$in}", $params);