From 7df5c5db2d3236be3683949ed1b45eb968f70a98 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Thu, 17 Nov 2016 12:51:54 +0100
Subject: [PATCH] don't add server automatically to trusted server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
apps/federation/lib/TrustedServers.php | 2 +-
apps/federation/tests/TrustedServersTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php
index f802af594dc..1376dd683d3 100644
--- a/apps/federation/lib/TrustedServers.php
+++ b/apps/federation/lib/TrustedServers.php
@@ -137,7 +137,7 @@ class TrustedServers {
* @return bool
*/
public function getAutoAddServers() {
- $value = $this->config->getAppValue('federation', 'autoAddServers', '1');
+ $value = $this->config->getAppValue('federation', 'autoAddServers', '0');
return $value === '1';
}
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index d16c0908dd4..598c2f01c90 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -172,7 +172,7 @@ class TrustedServersTest extends TestCase {
*/
public function testGetAutoAddServers($status, $expected) {
$this->config->expects($this->once())->method('getAppValue')
- ->with('federation', 'autoAddServers', '1')->willReturn($status);
+ ->with('federation', 'autoAddServers', '0')->willReturn($status);
$this->assertSame($expected,
$this->trustedServers->getAutoAddServers()
--
GitLab