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

Merge branch 'MDL-26185_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2011-04-04 13:21:24 +08:00
parent d7dd177eb4 507de745e3
commit 728f3c9d08
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/output/email/message_output_email.php
+1 -11
View File
@@ -46,18 +46,8 @@ class message_output_email extends message_output {
return true;
}
//hold onto email preference because /admin/cron.php sends a lot of messages at once
static $useremailaddresses = array();
//check user preference for where user wants email sent
if (!array_key_exists($eventdata->userto->id, $useremailaddresses)) {
$useremailaddresses[$eventdata->userto->id] = get_user_preferences('message_processor_email_email', $eventdata->userto->email, $eventdata->userto->id);
}
$usertoemailaddress = $useremailaddresses[$eventdata->userto->id];
if ( !empty($usertoemailaddress)) {
$userto->email = $usertoemailaddress;
}
$eventdata->userto->email = get_user_preferences('message_processor_email_email', $eventdata->userto->email, $eventdata->userto->id);
$result = email_to_user($eventdata->userto, $eventdata->userfrom,
$eventdata->subject, $eventdata->fullmessage, $eventdata->fullmessagehtml);