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

MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress.

Browse Source
This commit is contained in:
Rajesh Taneja
2013-01-09 14:50:32 +08:00
parent 228e09cdd1
commit a7a1e05ff9
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+4 -5
View File
@@ -715,9 +715,9 @@ function forum_cron() {
$eventdata->contexturl = "{$CFG->wwwroot}/mod/forum/discuss.php?d={$discussion->id}#p{$post->id}";
$eventdata->contexturlname = $discussion->name;
// If forum_replytouser is not set then set mail display to 0.
if (!$CFG->forum_replytouser) {
$eventdata->userfrom->maildisplay = 0;
// If forum_replytouser is not set then send mail using the noreplyaddress.
if (empty($CFG->forum_replytouser)) {
$eventdata->userfrom->email = $CFG->noreplyaddress;
}
$mailresult = message_send($eventdata);
@@ -1011,10 +1011,9 @@ function forum_cron() {
}
$attachment = $attachname='';
$usetrueaddress = true;
// Directly email forum digests rather than sending them via messaging, use the
// site shortname as 'from name', the noreply address will be used by email_to_user.
$mailresult = email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, $attachment, $attachname, $usetrueaddress);
$mailresult = email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, $attachment, $attachname);
if (!$mailresult) {
mtrace("ERROR!");