diff --git a/apps/files_sharing/lib/Listener/LoadSidebarListener.php b/apps/files_sharing/lib/Listener/LoadSidebarListener.php index 92d0e9bedc63a..55207a7afefc4 100644 --- a/apps/files_sharing/lib/Listener/LoadSidebarListener.php +++ b/apps/files_sharing/lib/Listener/LoadSidebarListener.php @@ -46,8 +46,9 @@ public function handle(Event $event): void { $showFederatedToTrustedAsInternal = $gsConfig->isGlobalScaleEnabled() || $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_TO_TRUSTED_AS_INTERNAL); $showFederatedAsInternal = ($gsConfig->isGlobalScaleEnabled() && $gsConfig->onlyInternalFederation()) || $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_AS_INTERNAL); - $showExternalSharing = $appConfig->getValueBool('files_sharing', 'outgoing_server2server_share_enabled', true) - || $appConfig->getValueBool('core', 'shareapi_allow_links', true); + $showExternalSharing = $appConfig->getValueBool('core', 'shareapi_allow_links', true) + || ($appConfig->getValueBool('files_sharing', 'outgoing_server2server_share_enabled', true) + && !$showFederatedAsInternal); $this->initialState->provideInitialState('showFederatedSharesAsInternal', $showFederatedAsInternal); $this->initialState->provideInitialState('showFederatedSharesToTrustedServersAsInternal', $showFederatedToTrustedAsInternal); diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index fa9710d6288fd..bd98240f066cb 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -54,7 +54,7 @@
-

{{ t('files_sharing', 'Internal shares') }}

+

{{ config.showExternalSharing ? t('files_sharing', 'Internal shares') : t('files_sharing', 'Shares') }}