Commit fafecb8d authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4582 (From name of "member validated" email is wrong)

parent e1007fdc
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -1148,12 +1148,7 @@ function cns_edit_member($member_id, $email_address, $preview_posts, $dob_day, $
        // NB: Same mail also sent in settings.php (quick-validate feature)
        $vm_subject = do_lang('VALIDATED_MEMBER_SUBJECT', get_site_name(), null, get_lang($member_id));
        $vm_body = do_lang('MEMBER_VALIDATED', get_site_name(), $_username, $login_url, get_lang($member_id));
        mail_wrap($vm_subject, $vm_body, array($email_address), $_username, $login_url, '', 3, null, false, null, false, false, false, 'MAIL', false, null, null, $join_time);
    }

    $old_email_address = $GLOBALS['FORUM_DRIVER']->get_member_row_field($member_id, 'm_email_address');
    if ($old_email_address != $email_address) {
        $GLOBALS['FORUM_DB']->query_update('f_invites', array('i_email_address' => $old_email_address), array('i_email_address' => $email_address));
        mail_wrap($vm_subject, $vm_body, array($email_address), $_username, '', '', 3, null, false, null, false, false, false, 'MAIL', false, null, null, $join_time);
    }

    $old_email_address = $GLOBALS['FORUM_DRIVER']->get_member_row_field($member_id, 'm_email_address');