upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Use the proper default values

Browse source 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2018-11-19 10:57:51 +01:00
parent 5ba33b7574
commit 511eade1d4
No known key found for this signature in database
GPG key ID: FE03C3A163FEDE68
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/Controller/CheckSetupController.php
View file

@ -529,7 +529,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 {

4
tests/Settings/Controller/CheckSetupControllerTest.php
View file

@ -533,11 +533,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'));