diff options
| author | Andy Scherzinger <info@andy-scherzinger.de> | 2025-01-30 09:33:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-30 09:33:24 +0100 |
| commit | 4a7c0b326769bfa39c4a8470f24f6f6e3420706a (patch) | |
| tree | bf45faa59e88d1434aba11bfe017485e22412049 /apps/settings | |
| parent | fce58d82fe13c507ecba2b1d447179a8b130a18a (diff) | |
| parent | b8de5e0d0973d5fcf72898245ef430ff85806861 (diff) | |
| download | nextcloud-server-4a7c0b326769bfa39c4a8470f24f6f6e3420706a.tar.gz nextcloud-server-4a7c0b326769bfa39c4a8470f24f6f6e3420706a.zip | |
Merge pull request #50281 from nextcloud/fix/fix-email-setupcheck-with-null-smtpmode
fix(settings): Fix setup check when mail_smptmode is set to "null"
Diffstat (limited to 'apps/settings')
| -rw-r--r-- | apps/settings/lib/SetupChecks/EmailTestSuccessful.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/settings/lib/SetupChecks/EmailTestSuccessful.php b/apps/settings/lib/SetupChecks/EmailTestSuccessful.php index a8f527f9dba..8cad8e82156 100644 --- a/apps/settings/lib/SetupChecks/EmailTestSuccessful.php +++ b/apps/settings/lib/SetupChecks/EmailTestSuccessful.php @@ -46,7 +46,9 @@ class EmailTestSuccessful implements ISetupCheck { } public function run(): SetupResult { - if ($this->wasEmailTestSuccessful()) { + if ($this->config->getSystemValueString('mail_smtpmode', 'smtp') === 'null') { + return SetupResult::success($this->l10n->t('Mail delivery is disabled by instance config "%s".', ['mail_smtpmode'])); + } elseif ($this->wasEmailTestSuccessful()) { return SetupResult::success($this->l10n->t('Email test was successfully sent')); } else { // If setup check could link to settings pages, this one should link to OC.generateUrl('/settings/admin') |