Commit a6612418 authored by Andrew Robert Nicols's avatar Andrew Robert Nicols
Browse files

Correct ignoredisabled test so that we always get $mailinfo (bug #689045).

Signed-off-by: default avatarAndrew Robert Nicols <>
parent 4653eabf
......@@ -288,7 +288,7 @@ function email_user($userto, $userfrom, $subject, $messagetext, $messagehtml='',
throw new InvalidArgumentException("empty user given to email_user");
if (!$userto->ignoredisabled && !$mailinfo = can_receive_email($userto)) {
if (!($mailinfo = can_receive_email($userto)) && !($userto->ignoredisabled)) {
throw new EmailDisabledException("email for this user has been disabled");
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment