summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-09-08 09:19:59 +0200
committerGitHub <noreply@github.com>2016-09-08 09:19:59 +0200
commitff691b4d8a26c08dcf9555c70a071cdebd1266e6 (patch)
treebf978f2f50d473c1a6de8fade6b7b47fece291de /settings
parentcdfe538452b709dd181ac11fcfca72a5221c79ad (diff)
parent9d00f367f9a00722cf64ee519397c8ed66769af2 (diff)
downloadnextcloud-server-ff691b4d8a26c08dcf9555c70a071cdebd1266e6.tar.gz
nextcloud-server-ff691b4d8a26c08dcf9555c70a071cdebd1266e6.zip
Merge pull request #836 from nextcloud/php7.1
Add PHP 7.1 drone tests
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/SecuritySettingsController.php2
1 files changed, 1 insertions, 1 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);