L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-51852-29' of git://github.com/andrewnicols/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2016-02-17 02:04:25 +01:00
parent 9bbbf76bae 0c34179b52
commit b33cd6d8ba
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+10
View File
@@ -756,6 +756,11 @@ function forum_cron() {
$replyaddress = $messageinboundgenerator->generate($userto->id);
}
if (!empty($CFG->forum_enabletimedposts) && ($discussion->timestart > $post->modified)) {
// Override the post->modified time with the discussion start for e-mails.
$post->modified = $discussion->timestart;
}
$a = new stdClass();
$a->courseshortname = $shortname;
$a->forumname = $cleanforumname;
@@ -1089,6 +1094,11 @@ function forum_cron() {
'Auto-Submitted: auto-generated',
);
if (!empty($CFG->forum_enabletimedposts) && ($discussion->timestart > $post->modified)) {
// Override the post->modified time with the discussion start for e-mails.
$post->modified = $discussion->timestart;
}
$maildigest = forum_get_user_maildigest_bulk($digests, $userto, $forum->id);
if ($maildigest == 2) {
// Subjects and link only