moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PULL-574 MDL-26185 Reverted changes due failed testing + review

Browse source
This commit is contained in:
Sam Hemelryk 2011-04-06 16:33:47 +08:00
parent 1d57f8622c
commit 62f7ce7989
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
message/output/email/message_output_email.php
View file

@ -46,10 +46,17 @@ class message_output_email extends message_output {
return true; 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 //check user preference for where user wants email sent
$preferedemail = get_user_preferences('message_processor_email_email', null, $eventdata->userto->id); if (!array_key_exists($eventdata->userto->id, $useremailaddresses)) {
if (!empty($preferedemail)) { $useremailaddresses[$eventdata->userto->id] = get_user_preferences('message_processor_email_email', $eventdata->userto->email, $eventdata->userto->id);
$eventdata->userto->email = $preferedemail; }
$usertoemailaddress = $useremailaddresses[$eventdata->userto->id];
if ( !empty($usertoemailaddress)) {
$userto->email = $usertoemailaddress;
} }
$result = email_to_user($eventdata->userto, $eventdata->userfrom, $result = email_to_user($eventdata->userto, $eventdata->userfrom,