Merge pull request #2210 from Daniel-KM/fix/module_template_theme

Fixed injection of module templates in theme with duplicate names (fix #2200).
omeka · Jul 15, 2024 · d816da2 · d816da2
2 parents 284af28 + 04872f3
commit d816da2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/application/src/Service/ThemeManagerFactory.php b/application/src/Service/ThemeManagerFactory.php
@@ -68,16 +68,19 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, arr
 
             $theme->setState(ThemeManager::STATE_ACTIVE);
 
-            // Inject module templates.
+            // Inject module templates, with priority to theme templates.
+            // Take care of merge with duplicate template keys.
             if (count($modulePageTemplates)) {
                 $configSpec['page_templates'] = empty($configSpec['page_templates'])
                     ? $modulePageTemplates
-                    : array_merge_recursive($configSpec['page_templates'], $modulePageTemplates);
+                    : array_replace($modulePageTemplates, $configSpec['page_templates']);
             }
             if (count($moduleBlockTemplates)) {
                 $configSpec['block_templates'] = empty($configSpec['block_templates'])
                     ? $moduleBlockTemplates
-                    : array_merge_recursive($configSpec['block_templates'], $moduleBlockTemplates);
+                    // Array_merge_recursive() converts duplicate keys to array.
+                    // Array_map() removes keys.
+                    : array_replace_recursive($moduleBlockTemplates, $configSpec['block_templates']);
             }
             $theme->setConfigSpec($configSpec);
         }