Permalink
Browse files

MDL-37152 remove bogus $mail->IsSMTP() breaking non-smtp mailing

Credit goes to Aurelijus Bruzas, thanks.
  • Loading branch information...
1 parent 322af44 commit ab7d4ea7ba2d88852a2501f6ab9ee6affe877499 @skodak skodak committed Dec 22, 2012
Showing with 1 addition and 3 deletions.
  1. +1 −3 lib/moodlelib.php
View
@@ -5161,9 +5161,8 @@ function moodle_process_email($modargs,$body) {
/**
* Get mailer instance, enable buffering, flush buffer or disable buffering.
*
- * @global object
* @param string $action 'get', 'buffer', 'close' or 'flush'
- * @return object|null mailer instance if 'get' used or nothing
+ * @return moodle_phpmailer|null mailer instance if 'get' used or nothing
*/
function get_mailer($action='get') {
global $CFG;
@@ -5502,7 +5501,6 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
if ($mail->Send()) {
set_send_count($user);
- $mail->IsSMTP(); // use SMTP directly
if (!empty($mail->SMTPDebug)) {
echo '</pre>';
}

0 comments on commit ab7d4ea

Please sign in to comment.