mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
[ticket/15214] Adjust event node logic
PHPBB3-15214
This commit is contained in:
parent
3a5247d01b
commit
43cf7b73bd
1 changed files with 11 additions and 11 deletions
|
@ -52,11 +52,8 @@ class event extends \Twig\Node\Node
|
|||
foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
|
||||
{
|
||||
$ext_namespace = str_replace('/', '_', $ext_namespace);
|
||||
if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
|
||||
{
|
||||
$priority_key = $this->template_event_priority_array[$ext_namespace][$location] ?? 0;
|
||||
$template_events[$priority_key][] = $ext_namespace;
|
||||
}
|
||||
$priority_key = $this->template_event_priority_array[$ext_namespace][$location] ?? 0;
|
||||
$template_events[$priority_key][] = $ext_namespace;
|
||||
}
|
||||
krsort($template_events);
|
||||
|
||||
|
@ -75,13 +72,16 @@ class event extends \Twig\Node\Node
|
|||
->indent();
|
||||
}
|
||||
|
||||
$compiler
|
||||
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
|
||||
if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
|
||||
{
|
||||
$compiler
|
||||
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
|
||||
|
||||
// We set the namespace lookup order to be this extension first, then the main path
|
||||
->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
|
||||
->write("\$this->env->loadTemplate(\$this->env->getTemplateClass('@{$ext_namespace}/{$location}.html'), '@{$ext_namespace}/{$location}.html')->display(\$context);\n")
|
||||
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
|
||||
// We set the namespace lookup order to be this extension first, then the main path
|
||||
->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
|
||||
->write("\$this->env->loadTemplate(\$this->env->getTemplateClass('@{$ext_namespace}/{$location}.html'), '@{$ext_namespace}/{$location}.html')->display(\$context);\n")
|
||||
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
|
||||
}
|
||||
|
||||
if ($this->environment->isDebug())
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue