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

Merge pull request #20002 from nextcloud/backport/19995/stable16 

[stable16] Default value of lookupServerEnabled should be the same everywhere
This commit is contained in:
Roeland Jago Douma 2020-03-17 18:28:35 +01:00 committed by GitHub
parent 2bfaa94804 e990a43709
commit e641d6f1bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/federatedfilesharing/lib/FederatedShareProvider.php
View File

@ -1043,7 +1043,7 @@ class FederatedShareProvider implements IShareProvider {
if ($this->gsConfig->isGlobalScaleEnabled()) { if ($this->gsConfig->isGlobalScaleEnabled()) {
return true; return true;
} }
$result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no'); $result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes');
return ($result === 'yes'); return ($result === 'yes');
} }

2
apps/federatedfilesharing/tests/FederatedShareProviderTest.php
View File

@ -777,7 +777,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
$this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled') $this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled')
->willReturn($gsEnabled); ->willReturn($gsEnabled);
$this->config->expects($this->any())->method('getAppValue') $this->config->expects($this->any())->method('getAppValue')
->with('files_sharing', 'lookupServerEnabled', 'no') ->with('files_sharing', 'lookupServerEnabled', 'yes')
->willReturn($isEnabled); ->willReturn($isEnabled);
$this->assertSame($expected, $this->assertSame($expected,