-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
use getsystemvalue-functions in Mailer.php #38958
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
/backport to stable27 |
|
/backport to stable26 |
9df6883 to
192ac56
Compare
Signed-off-by: Simon L <[email protected]>
192ac56 to
76bedb8
Compare
| */ | ||
| protected function getSmtpInstance(): EsmtpTransport { | ||
| // either null or true - if nothing is passed, let the symfony mailer figure out the configuration by itself | ||
| $mailSmtpsecure = ($this->config->getSystemValue('mail_smtpsecure', null) === 'ssl') ? true : null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe?
| $mailSmtpsecure = ($this->config->getSystemValue('mail_smtpsecure', null) === 'ssl') ? true : null; | |
| $mailSmtpsecure = ($this->config->getSystemValueString('mail_smtpsecure', '') === 'ssl') ? true : null; |
| $transport->setPassword($this->config->getSystemValueString('mail_smtppassword', '')); | ||
| } | ||
|
|
||
| $streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe?
| $streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []); | |
| $streamingOptions = (array)$this->config->getSystemValue('mail_smtpstreamoptions', []); |
Signed-off-by: Simon L <[email protected]>
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport to stable26 |
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
Fix #38957