From: skodak <skodak>
Date: Tue, 18 Mar 2008 08:28:27 +0000 (+0000)
Subject: MDLSITE-320 digest processing should be able to continue without duplicates if fails... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=91e450813c02a66c82d0a020c1eefe138155162f;p=moodle.git

MDLSITE-320 digest processing should be able to continue without duplicates if fails; merged from MOODLE_19_STABLE
---

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 808dd16256..07bf154fe8 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -488,7 +488,7 @@ function forum_cron() {
 
         mtrace('Sending forum digests: '.userdate($timenow, '', $sitetimezone));
 
-        $digestposts_rs = get_recordset('forum_queue');
+        $digestposts_rs = get_recordset_select('forum_queue', "timemodified < $digesttime");
 
         if (!rs_EOF($digestposts_rs)) {
 
@@ -568,7 +568,7 @@ function forum_cron() {
                 mtrace(get_string('processingdigest', 'forum', $userid), '... ');
 
                 // First of all delete all the queue entries for this user
-                delete_records('forum_queue', 'userid', $userid);
+                delete_records_select('forum_queue', "userid = $userid AND timemodified < $digesttime");
                 $userto = $users[$userid];
 
                 // Override the language and timezone of the "current" user, so that