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

Merge pull request #2178 from nextcloud/federation_sharing_changes 

don't add server automatically to trusted server
This commit is contained in:
Morris Jobke 2016-11-18 00:49:48 +01:00 committed by GitHub
parent 6fa5c18a79 7df5c5db2d
commit 19e4ac33a9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/federation/lib/TrustedServers.php
View File

@ -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';
}

2
apps/federation/tests/TrustedServersTest.php
View File

@ -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()