[stable31] fix(federation): Allow federation file sharing when federation app is…#52425
Merged
AndyScherzinger merged 1 commit intostable31from Apr 25, 2025
Merged
[stable31] fix(federation): Allow federation file sharing when federation app is…#52425AndyScherzinger merged 1 commit intostable31from
AndyScherzinger merged 1 commit intostable31from
Conversation
… disabled The app id might be misleading, the federation app is for syncing addressbooks with trusted servers. It is not always enabled and show not have to be. Signed-off-by: Joas Schilling <[email protected]>
b6729aa to
655d0fc
Compare
Member
|
Adjusted the backport with: diff --git a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
index 4d881e53b13..3c669a226b4 100644
--- a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
+++ b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
@@ -156,7 +156,7 @@ class CloudFederationProviderFiles implements ISignedCloudFederationProvider {
$ownerDisplayName = $this->getUserDisplayName($ownerFederatedId);
$trustedServers = null;
- if ($this->appManager->isEnabledForAnyone('federation')
+ if ($this->appManager->isInstalled('federation')
&& class_exists(TrustedServers::class)) {
try {
$trustedServers = Server::get(TrustedServers::class); |
nickvergessen
approved these changes
Apr 25, 2025
AndyScherzinger
approved these changes
Apr 25, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of PR #52404