Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle

2012-03-27 10:05:43 +13:00
parent c194925278 70ad827c6c
commit 5dc1a544ea
3 changed files with 8 additions and 2 deletions
@@ -5020,6 +5020,7 @@ function get_mailer($action='get') {
                $mailer->SMTPDebug = true;
            }
            $mailer->Host          = $CFG->smtphosts;        // specify main and backup servers
+            $mailer->SMTPSecure    = $CFG->smtpsecure;       // specify secure connection protocol
            $mailer->SMTPKeepAlive = $prevkeepalive;         // use previous keepalive

            if ($CFG->smtpuser) {                            // Use SMTP authentication