diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-03-17 18:27:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 18:27:22 +0100 |
| commit | 4ce142202bcf71fe83b662f3f3209204a3a108c1 (patch) | |
| tree | 29a93a58bd54cd2219b87d4e1eecc81cfba0810d | |
| parent | 6f5a389f0f580fe5d306cc0d5275c44cc7127ddf (diff) | |
| parent | 8143cf5fa3cb33524d480ee7092e02a56e73366a (diff) | |
| download | nextcloud-server-4ce142202bcf71fe83b662f3f3209204a3a108c1.tar.gz nextcloud-server-4ce142202bcf71fe83b662f3f3209204a3a108c1.zip | |
Merge pull request #19998 from nextcloud/backport/19995/stable18
[stable18] Default value of lookupServerEnabled should be the same everywhere
| -rw-r--r-- | apps/federatedfilesharing/lib/FederatedShareProvider.php | 2 | ||||
| -rw-r--r-- | apps/federatedfilesharing/tests/FederatedShareProviderTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index cf5ee133ea6..575e3cdff57 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -1046,7 +1046,7 @@ class FederatedShareProvider implements IShareProvider { if ($this->gsConfig->isGlobalScaleEnabled()) { return true; } - $result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no'); + $result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes'); return ($result === 'yes'); } diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index a92426b0bef..c8acdd3df53 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -778,7 +778,7 @@ class FederatedShareProviderTest extends \Test\TestCase { $this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled') ->willReturn($gsEnabled); $this->config->expects($this->any())->method('getAppValue') - ->with('files_sharing', 'lookupServerEnabled', 'no') + ->with('files_sharing', 'lookupServerEnabled', 'yes') ->willReturn($isEnabled); $this->assertSame($expected, |