Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'w51_MDL-37152_m24_smtp' of git://github.com/skodak/mood…

…le into MOODLE_24_STABLE
  • Loading branch information...
commit 844cb63fed1fce685f10edbd2233962943c1fdb9 2 parents 0a32dca + ab7d4ea
Eloy Lafuente (stronk7) stronk7 authored

Showing 1 changed file with 1 addition and 3 deletions. Show diff stats Hide diff stats

  1. +1 3 lib/moodlelib.php
4 lib/moodlelib.php
@@ -5161,9 +5161,8 @@ function moodle_process_email($modargs,$body) {
5161 5161 /**
5162 5162 * Get mailer instance, enable buffering, flush buffer or disable buffering.
5163 5163 *
5164   - * @global object
5165 5164 * @param string $action 'get', 'buffer', 'close' or 'flush'
5166   - * @return object|null mailer instance if 'get' used or nothing
  5165 + * @return moodle_phpmailer|null mailer instance if 'get' used or nothing
5167 5166 */
5168 5167 function get_mailer($action='get') {
5169 5168 global $CFG;
@@ -5502,7 +5501,6 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
5502 5501
5503 5502 if ($mail->Send()) {
5504 5503 set_send_count($user);
5505   - $mail->IsSMTP(); // use SMTP directly
5506 5504 if (!empty($mail->SMTPDebug)) {
5507 5505 echo '</pre>';
5508 5506 }

0 comments on commit 844cb63

Please sign in to comment.
Something went wrong with that request. Please try again.