From 017a713900f92f9af0f9f8315fd069c25e2c0da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 22 Dec 2012 14:46:44 +0100 Subject: [PATCH] MDL-37152 remove bogus $mail->IsSMTP() breaking non-smtp mailing Credit goes to Aurelijus Bruzas, thanks. --- lib/moodlelib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 9a8ddf182c4..467ca05de41 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -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 ''; }