Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2015-02-03 12:36:00 +01:00
commit 7172903fcf

View File

@ -789,10 +789,7 @@ function forum_cron() {
// If forum_replytouser is not set then send mail using the noreplyaddress.
if (empty($CFG->forum_replytouser)) {
// Clone userfrom as it is referenced by $users.
$cloneduserfrom = clone($userfrom);
$cloneduserfrom->email = $CFG->noreplyaddress;
$eventdata->userfrom = $cloneduserfrom;
$eventdata->userfrom = core_user::get_noreply_user();
}
$smallmessagestrings = new stdClass();