summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-19 10:57:51 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-11-19 10:57:51 +0100
commit8e4f0f9d1734f15b28f10ce4b612b52b7621a3bc (patch)
tree00b5884cbeeb854e52527da0231379949574463b
parent9561a7a1e2cacca3a1d2a775a2492d411fe02636 (diff)
downloadnextcloud-server-8e4f0f9d1734f15b28f10ce4b612b52b7621a3bc.tar.gz
nextcloud-server-8e4f0f9d1734f15b28f10ce4b612b52b7621a3bc.zip
Use the proper default values
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r--settings/Controller/CheckSetupController.php2
-rw-r--r--tests/Settings/Controller/CheckSetupControllerTest.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index cc9cb17388e..ba56c72dccf 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -530,7 +530,7 @@ Raw output
}
protected function isPhpMailerUsed(): bool {
- return $this->config->getSystemValue('mail_smtpmode') === 'php';
+ return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
}
protected function hasOpcacheLoaded(): bool {
diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
index 617685d6196..ff565f3734b 100644
--- a/tests/Settings/Controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -543,11 +543,11 @@ class CheckSetupControllerTest extends TestCase {
$this->config->expects($this->at(0))
->method('getSystemValue')
- ->with('mail_smtpmode', null)
+ ->with('mail_smtpmode', 'smtp')
->will($this->returnValue('php'));
$this->config->expects($this->at(1))
->method('getSystemValue')
- ->with('mail_smtpmode', null)
+ ->with('mail_smtpmode', 'smtp')
->will($this->returnValue('not-php'));
$this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed'));