summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis <6653109+artonge@users.noreply.github.com>2023-07-10 10:37:38 +0100
committerGitHub <noreply@github.com>2023-07-10 10:37:38 +0100
commit0a876e3ac8138dc8d4734a2491284798c300fdd6 (patch)
tree3cabb03390312143876ba0363de23e51bffacc2d
parent7e9bd4fcea91e59e345bf9bf2c51c5069171b546 (diff)
parentf287866982327de081d1eacb8d50c586c341d07d (diff)
downloadnextcloud-server-0a876e3ac8138dc8d4734a2491284798c300fdd6.tar.gz
nextcloud-server-0a876e3ac8138dc8d4734a2491284798c300fdd6.zip
Merge pull request #39147 from nextcloud/backport/38794/stable27
[stable27] 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),
]
];
}