fixup! Prevent column name conflict between tables

nextcloud · Mar 31, 2022 · 0975680 · 0975680
1 parent 764aeb2
commit 0975680
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
@@ -679,9 +679,7 @@ public function getSharesInFolder($userId, Folder $node, $reshares) {
 		$shares = [];
 		while ($data = $cursor->fetch()) {
 			// Prevent permissions for oc_share to be shadowed by the one from oc_filecache.
-			if (isset($data['f_permissions'])) {
-				$data['permissions'] = $data['s_permissions'];
-			}
+			$data['permissions'] = $data['s_permissions'];
 			$shares[$data['fileid']][] = $this->createShare($data);
 		}
 		$cursor->closeCursor();