Merge pull request #131 from nextcloud/backport/130/stable22

[stable22] fix index of groupfolders
nextcloud · Aug 11, 2021 · 390c941 · 390c941
2 parents 7e03119 + 510e7e3
commit 390c941
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/Model/MountPoint.php b/lib/Model/MountPoint.php
@@ -46,16 +46,16 @@ class MountPoint implements JsonSerializable {
 	private $id;
 
 	/** @var string */
-	private $path;
+	private $path = '';
 
 	/** @var bool */
-	private $global;
+	private $global = false;
 
 	/** @var array */
-	private $groups;
+	private $groups = [];
 
 	/** @var array */
-	private $users;
+	private $users = [];
 
 
 	/**
@@ -116,7 +116,7 @@ public function setGlobal(bool $global): MountPoint {
 
 
 	/**
-	 * @return array
+	 * @return array'
 	 */
 	public function getGroups(): array {
 		return $this->groups;

diff --git a/lib/Service/GroupFoldersService.php b/lib/Service/GroupFoldersService.php
@@ -103,7 +103,8 @@ public function __construct(
 		ConfigService $configService, MiscService $miscService
 	) {
 
-		if ($appManager->isEnabledForUser('groupfolders', $userId)) {
+		if ($configService->getAppValue(ConfigService::FILES_GROUP_FOLDERS) === '1'
+			&& $appManager->isEnabledForUser('groupfolders', $userId)) {
 			try {
 				$this->folderManager = new FolderManager($dbConnection);
 			} catch (Exception $e) {