mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-27 12:29:38 +00:00
[ticket/15214] Move if statement to a better place
Putting this here will have the loop run the same amount of times as default. Without this, the loop runs too many extra times. PHPBB3-15214
This commit is contained in:
parent
1e2532a9a9
commit
648cd688ca
1 changed files with 26 additions and 26 deletions
|
@ -51,9 +51,12 @@ class event extends \Twig\Node\Node
|
||||||
// Group and sort extension template events in according to their priority (0 by default if not set)
|
// Group and sort extension template events in according to their priority (0 by default if not set)
|
||||||
foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
|
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;
|
$ext_namespace = str_replace('/', '_', $ext_namespace);
|
||||||
|
$priority_key = $this->template_event_priority_array[$ext_namespace][$location] ?? 0;
|
||||||
|
$template_events[$priority_key][] = $ext_namespace;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
krsort($template_events);
|
krsort($template_events);
|
||||||
|
|
||||||
|
@ -61,33 +64,30 @@ class event extends \Twig\Node\Node
|
||||||
{
|
{
|
||||||
foreach ($events as $ext_namespace)
|
foreach ($events as $ext_namespace)
|
||||||
{
|
{
|
||||||
if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
|
if ($this->environment->isDebug())
|
||||||
{
|
{
|
||||||
if ($this->environment->isDebug())
|
// If debug mode is enabled, lets check for new/removed EVENT
|
||||||
{
|
// templates on page load rather than at compile. This is
|
||||||
// If debug mode is enabled, lets check for new/removed EVENT
|
// slower, but makes developing extensions easier (no need to
|
||||||
// templates on page load rather than at compile. This is
|
// purge the cache when a new event template file is added)
|
||||||
// slower, but makes developing extensions easier (no need to
|
|
||||||
// purge the cache when a new event template file is added)
|
|
||||||
$compiler
|
|
||||||
->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
|
|
||||||
->indent();
|
|
||||||
}
|
|
||||||
|
|
||||||
$compiler
|
$compiler
|
||||||
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
|
->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
|
||||||
|
->indent();
|
||||||
|
}
|
||||||
|
|
||||||
// We set the namespace lookup order to be this extension first, then the main path
|
$compiler
|
||||||
->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
|
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
|
||||||
->write("\$this->env->loadTemplate('@{$ext_namespace}/{$location}.html')->display(\$context);\n")
|
|
||||||
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
|
|
||||||
|
|
||||||
if ($this->environment->isDebug())
|
// We set the namespace lookup order to be this extension first, then the main path
|
||||||
{
|
->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
|
||||||
$compiler
|
->write("\$this->env->loadTemplate('@{$ext_namespace}/{$location}.html')->display(\$context);\n")
|
||||||
->outdent()
|
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
|
||||||
->write("}\n\n");
|
|
||||||
}
|
if ($this->environment->isDebug())
|
||||||
|
{
|
||||||
|
$compiler
|
||||||
|
->outdent()
|
||||||
|
->write("}\n\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue