diff options
| author | Frederik Bosch <f.bosch@genkgo.nl> | 2017-09-04 07:58:44 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-09-04 07:58:44 +0300 |
| commit | 143273c6f4d04d8e7de8179409a8df5635e04307 (patch) | |
| tree | 77c2567761a0d4442746b081264d9c59d6af57b9 /core | |
| parent | 660df51720386077f0a1433d86bcb96ef002de35 (diff) | |
Different SMTP ports never used (#11961)
* Different SMTP ports never used
* Remove ini_set
Diffstat (limited to 'core')
| -rw-r--r-- | core/Mail.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/Mail.php b/core/Mail.php index c6c8623cfd..a3771f536d 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -111,11 +111,14 @@ class Mail extends Zend_Mail if (!empty($mailConfig['encryption'])) { $smtpConfig['ssl'] = $mailConfig['encryption']; } + + if (!empty($mailConfig['port'])) { + $smtpConfig['port'] = $mailConfig['port']; + } $host = trim($mailConfig['host']); $tr = new \Zend_Mail_Transport_Smtp($host, $smtpConfig); Mail::setDefaultTransport($tr); - @ini_set("smtp_port", $mailConfig['port']); } public function send($transport = null) |