From 0975680ec8f0d307e6a07b1af247088e2c8dc3c7 Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Thu, 31 Mar 2022 17:38:45 +0200
Subject: [PATCH] fixup! Prevent column name conflict between tables

---
 lib/private/Share20/DefaultShareProvider.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index b90493ca3cfe2..d9e977270d135 100644
--- 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();