mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-01-08 18:01:43 +01:00
commit 4f90540e0c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/moodlelib.php
View File

@ -5165,9 +5165,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;
@ -5506,7 +5505,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>';
}