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 don't display from user email"

Browse Source
This commit is contained in:
Isaac Marco Blancas
2013-01-09 14:53:04 +08:00
committed by Rajesh Taneja
parent d63a406b02
commit 3c3ca35fee
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+6 -1
View File
@@ -715,6 +715,11 @@ 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;
}
$mailresult = message_send($eventdata);
if (!$mailresult){
mtrace("Error: mod/forum/lib.php forum_cron(): Could not send out mail for id $post->id to user $userto->id".
@@ -1009,7 +1014,7 @@ function forum_cron() {
$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, $CFG->forum_replytouser);
$mailresult = email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, $attachment, $attachname, $usetrueaddress);
if (!$mailresult) {
mtrace("ERROR!");