diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-09-06 10:29:14 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-09-07 22:09:32 +0200 |
| commit | 1cdf4e9540b6b804fafec045371a64bd0bcfa027 (patch) | |
| tree | 52af4ad749707db9f94ac5a2283130d49d83bf5b | |
| parent | fb4850ffa8127168a048538ce84dd909ff6553f4 (diff) | |
| download | nextcloud-server-1cdf4e9540b6b804fafec045371a64bd0bcfa027.tar.gz nextcloud-server-1cdf4e9540b6b804fafec045371a64bd0bcfa027.zip | |
Set default
| -rw-r--r-- | settings/Controller/SecuritySettingsController.php | 2 | ||||
| -rw-r--r-- | tests/Settings/Controller/SecuritySettingsControllerTest.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php index 44e07f25a0b..d0d57437799 100644 --- a/settings/Controller/SecuritySettingsController.php +++ b/settings/Controller/SecuritySettingsController.php @@ -61,7 +61,7 @@ class SecuritySettingsController extends Controller { * @return array */ public function trustedDomains($newTrustedDomain) { - $trustedDomains = $this->config->getSystemValue('trusted_domains'); + $trustedDomains = $this->config->getSystemValue('trusted_domains', []); $trustedDomains[] = $newTrustedDomain; $this->config->setSystemValue('trusted_domains', $trustedDomains); diff --git a/tests/Settings/Controller/SecuritySettingsControllerTest.php b/tests/Settings/Controller/SecuritySettingsControllerTest.php index 11b0edcae23..302dc730fc4 100644 --- a/tests/Settings/Controller/SecuritySettingsControllerTest.php +++ b/tests/Settings/Controller/SecuritySettingsControllerTest.php @@ -57,8 +57,8 @@ class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase { $this->container['Config'] ->expects($this->once()) ->method('getSystemValue') - ->with('trusted_domains') - ->will($this->returnValue('')); + ->with($this->equalTo('trusted_domains'), $this->equalTo([])) + ->willReturn([]); $response = $this->securitySettingsController->trustedDomains('newdomain.com'); $expectedResponse = array('status' => 'success'); |