mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the proper default values 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2018-11-19 10:57:51 +01:00
parent 9561a7a1e2
commit 8e4f0f9d17
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

@ -530,7 +530,7 @@ Raw output
} }
protected function isPhpMailerUsed(): bool { protected function isPhpMailerUsed(): bool {
return $this->config->getSystemValue('mail_smtpmode') === 'php'; return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
} }
protected function hasOpcacheLoaded(): bool { protected function hasOpcacheLoaded(): bool {

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

@ -543,11 +543,11 @@ class CheckSetupControllerTest extends TestCase {
$this->config->expects($this->at(0)) $this->config->expects($this->at(0))
->method('getSystemValue') ->method('getSystemValue')
->with('mail_smtpmode', null) ->with('mail_smtpmode', 'smtp')
->will($this->returnValue('php')); ->will($this->returnValue('php'));
$this->config->expects($this->at(1)) $this->config->expects($this->at(1))
->method('getSystemValue') ->method('getSystemValue')
->with('mail_smtpmode', null) ->with('mail_smtpmode', 'smtp')
->will($this->returnValue('not-php')); ->will($this->returnValue('not-php'));
$this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed')); $this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed'));