Merge pull request #39147 from nextcloud/backport/38794/stable27

[stable27] Enable version features again with S3 versioning

Author: artonge

apps/files_versions/lib/Capabilities.php

@@ -46,13 +46,13 @@ public function __construct(
 	 * @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),
 			]
 		];
 	}