Merge pull request #56722 from nextcloud/fix/deduplicate-templates

elzody · web-flow · commit 070ec617591f · 2025-12-10T18:21:40.000-05:00
fix(templates): deduplicate provider templates
diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php
@@ -213,12 +213,13 @@ private function getProviderTemplates(TemplateFileCreator $type): array {
 		foreach ($this->getRegisteredProviders() as $provider) {
 			foreach ($type->getMimetypes() as $mimetype) {
 				foreach ($provider->getCustomTemplates($mimetype) as $template) {
-					$templates[] = $template;
+					$templateId = $template->jsonSerialize()['templateId'];
+					$templates[$templateId] = $template;
 				}
 			}
 		}
 
-		return $templates;
+		return array_values($templates);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -213,12 +213,13 @@ private function getProviderTemplates(TemplateFileCreator $type): array {`
`213`	`213`	`foreach ($this->getRegisteredProviders() as $provider) {`
`214`	`214`	`foreach ($type->getMimetypes() as $mimetype) {`
`215`	`215`	`foreach ($provider->getCustomTemplates($mimetype) as $template) {`
`216`		`- $templates[] = $template;`
	`216`	`+ $templateId = $template->jsonSerialize()['templateId'];`
	`217`	`+ $templates[$templateId] = $template;`
`217`	`218`	`}`
`218`	`219`	`}`
`219`	`220`	`}`
`220`	`221`
`221`		`- return $templates;`
	`222`	`+ return array_values($templates);`
`222`	`223`	`}`
`223`	`224`
`224`	`225`	`/**`