Permalink
Browse files

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

Credit goes to Aurelijus Bruzas, thanks.
  • Loading branch information...
1 parent 591b342 commit 574fcfba8a1ab91c13fe3e0bf6f2551a04f1f271 @skodak skodak committed with stronk7 Dec 22, 2012
Showing with 1 addition and 3 deletions.
  1. +1 −3 lib/moodlelib.php
View
@@ -4993,9 +4993,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;
@@ -5334,7 +5333,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 574fcfb

Please sign in to comment.