Merge branch 'MDL-78146-master' of https://github.com/meirzamoodle/moodle

This commit is contained in:
Andrew Nicols 2023-06-01 11:01:34 +08:00
commit d60ce4c575
No known key found for this signature in database
GPG Key ID: 6D1E3157C8CFBF14

View File

@ -47,7 +47,6 @@ class moodle_phpmailer extends \PHPMailer\PHPMailer\PHPMailer {
*/
public function __construct(){
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;