Merge branch 'm31_MDL-52637_Disable_Automatically_Enabling_TLS_Encryption' of https://github.com/scara/moodle

2016-02-08 13:47:06 +08:00
parent 502648e3a6 074b3dcecc
commit 4af9a8bfd3
1 changed files with 2 additions and 0 deletions
@@ -52,6 +52,8 @@ class moodle_phpmailer extends PHPMailer {
        global $CFG;
        $this->Version   = 'Moodle '.$CFG->version;         // mailer version
        $this->CharSet   = 'UTF-8';
+        // MDL-52637: Disable the automatic TLS encryption added in v5.2.10 (9da56fc1328a72aa124b35b738966315c41ef5c6).
+        $this->SMTPAutoTLS = false;

        if (!empty($CFG->smtpauthtype)) {
            $this->AuthType = $CFG->smtpauthtype;