From 46291363bf52d86de6fa2d1c1347373ca1436727 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 17 Sep 2026 17:56:12 +0200 Subject: [PATCH 1/2] fix: corrently handle direct editor creator returned templates fixes #64461 Signed-off-by: Robin Appelman --- lib/private/DirectEditing/Manager.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/private/DirectEditing/Manager.php b/lib/private/DirectEditing/Manager.php index c849e4a5cf95a..a73a40b1e19c1 100644 --- a/lib/private/DirectEditing/Manager.php +++ b/lib/private/DirectEditing/Manager.php @@ -13,6 +13,7 @@ use OCP\Constants; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DirectEditing\ACreateFromTemplate; +use OCP\DirectEditing\ATemplate; use OCP\DirectEditing\IEditor; use OCP\DirectEditing\IManager; use OCP\DirectEditing\IToken; @@ -84,6 +85,10 @@ public function getTemplates(string $editor, string $type): array { } $templates = array_map(function ($template) use ($creator) { + if ($template instanceof ATemplate) { + $template = $template->jsonSerialize(); + } + $template['extension'] = $creator->getExtension(); $template['mimetype'] = $creator->getMimetype(); return $template; From 15759ab46d9d88abf97f37ec6d1be05e6e23ecdd Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 17 Sep 2026 19:54:13 +0200 Subject: [PATCH 2/2] chore: update psalm baseline Signed-off-by: Robin Appelman --- build/psalm-baseline.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 41e597623171a..0ea6a0a1a3b66 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -3541,12 +3541,6 @@ - - - - - -