Merge pull request #42357 from nextcloud/backport/42350/stable28

[stable28] Don't query oc_properties for metadata props
nextcloud · Dec 18, 2023 · 4cbf64b · 4cbf64b
2 parents 36f9106 + 112063b
commit 4cbf64b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -27,6 +27,7 @@
 
 use Exception;
 use OCA\DAV\Connector\Sabre\Directory;
+use OCA\DAV\Connector\Sabre\FilesPlugin;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUser;
@@ -136,7 +137,7 @@ class CustomPropertiesBackend implements BackendInterface {
 	public function __construct(
 		Tree $tree,
 		IDBConnection $connection,
-		IUser $user
+		IUser $user,
 	) {
 		$this->tree = $tree;
 		$this->connection = $connection;
@@ -156,7 +157,11 @@ public function propFind($path, PropFind $propFind) {
 		// these might appear
 		$requestedProps = array_diff(
 			$requestedProps,
-			self::IGNORED_PROPERTIES
+			self::IGNORED_PROPERTIES,
+		);
+		$requestedProps = array_filter(
+			$requestedProps,
+			fn ($prop) => !str_starts_with($prop, FilesPlugin::FILE_METADATA_PREFIX),
 		);
 
 		// substr of calendars/ => path is inside the CalDAV component