Skip to content

Commit 824fab4

Browse files
committed
OXDEV-9553 Draft
1 parent 2d3acb2 commit 824fab4

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/Resolver/TemplateChain/DataObject/TemplateChain.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,9 @@ public function getIterator(): Traversable
9494
{
9595
return new ArrayIterator($this->chain);
9696
}
97+
98+
public function prepend(TemplateTypeInterface $templateType)
99+
{
100+
$this->chain = [$templateType->getFullyQualifiedName() => $templateType] + $this->chain;
101+
}
97102
}

src/Resolver/TemplateChain/TemplateHandler/ModuleExtensions/ModuleTemplateHandler.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ public function addToChain(
3232
return $templateChain;
3333
}
3434
$extension = $this->getExtension($templateType, $directory);
35+
if ($templateChain->hasModuleId($extension->getParentNamespace()) && $extension->getParentNamespace() !== $extension->getNamespace()) {
36+
$templateChain->prepend($extension);
37+
return $templateChain;
38+
}
3539
return $this->chainAppender->addToChain($templateChain, $extension, $directory);
3640
}
3741

0 commit comments

Comments
 (0)