aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis <6653109+artonge@users.noreply.github.com>2023-06-13 21:45:23 +0200
committerGitHub <noreply@github.com>2023-06-13 21:45:23 +0200
commit69f6585e3604792587ae917d78a7bcec9e05f61b (patch)
tree68490a7f91e6816e5c24eb4428fbf6d6efb3b28d
parentaedb4bef1e6b012637d822ed25948d1a8b3ded4d (diff)
parent75e04614c18bff84faa5eee890e9b0b8402375c7 (diff)
downloadnextcloud-server-69f6585e3604792587ae917d78a7bcec9e05f61b.tar.gz
nextcloud-server-69f6585e3604792587ae917d78a7bcec9e05f61b.zip
Merge pull request #38794 from bensmrs/master
Enable version features again with S3 versioning
-rw-r--r--apps/files_versions/lib/Capabilities.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_versions/lib/Capabilities.php b/apps/files_versions/lib/Capabilities.php
index e97a5c4aaa4..afc6fa39da7 100644
--- a/apps/files_versions/lib/Capabilities.php
+++ b/apps/files_versions/lib/Capabilities.php
@@ -46,13 +46,13 @@ class Capabilities implements ICapability {
* @return array
*/
public function getCapabilities() {
- $groupFolderOrS3VersioningInstalled = $this->appManager->isInstalled('groupfolders') || $this->appManager->isInstalled('files_versions_s3');
+ $groupFolderInstalled = $this->appManager->isInstalled('groupfolders');
return [
'files' => [
'versioning' => true,
- 'version_labeling' => !$groupFolderOrS3VersioningInstalled && $this->config->getSystemValueBool('enable_version_labeling', true),
- 'version_deletion' => !$groupFolderOrS3VersioningInstalled && $this->config->getSystemValueBool('enable_version_deletion', true),
+ 'version_labeling' => !$groupFolderInstalled && $this->config->getSystemValueBool('enable_version_labeling', true),
+ 'version_deletion' => !$groupFolderInstalled && $this->config->getSystemValueBool('enable_version_deletion', true),
]
];
}