From f9b0f049efb723dfd9ce0fb41549f632c3053c1c 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 a362e0a0e182b..721f2319c6462 100644 --- a/lib/private/DirectEditing/Manager.php +++ b/lib/private/DirectEditing/Manager.php @@ -14,6 +14,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; @@ -88,6 +89,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 3f37d3e2984c7a8f3cf71ea17be22286360e5fc7 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 7141a5694f457..6eb2eca1b5f03 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -3652,12 +3652,6 @@ - - - - - -