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

[stable28] Don't query oc_properties for metadata props
This commit is contained in:
Louis 2023-12-18 18:01:04 +01:00 committed by GitHub
commit 4cbf64b030
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -27,6 +27,7 @@ namespace OCA\DAV\DAV;
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 @@ class CustomPropertiesBackend implements BackendInterface {
// 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