diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-11-18 00:49:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 00:49:48 +0100 |
| commit | 19e4ac33a91919d9aa9c08ff46054560c63cf3e8 (patch) | |
| tree | 9f8c79309f2eb49a966723cb2db7354406dde83d | |
| parent | 6fa5c18a79fbd8fdc77da4eeb5cf17a7c49815e2 (diff) | |
| parent | 7df5c5db2d3236be3683949ed1b45eb968f70a98 (diff) | |
| download | nextcloud-server-19e4ac33a91919d9aa9c08ff46054560c63cf3e8.tar.gz nextcloud-server-19e4ac33a91919d9aa9c08ff46054560c63cf3e8.zip | |
Merge pull request #2178 from nextcloud/federation_sharing_changes
don't add server automatically to trusted server
| -rw-r--r-- | apps/federation/lib/TrustedServers.php | 2 | ||||
| -rw-r--r-- | 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() |