makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11777] Add subdirectory 'events/' to the template event search path

Browse source 
Makes the twig template engine look in the events/ subdirectory instead of the
main styles/[style]/template/ directory for extension template events. Note
that it does _not_ look recursively!

PHPBB3-11777
This commit is contained in:
rechosen 2013-08-08 11:31:06 +02:00
parent c9cd7412f2
commit 49824a0fd3
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/template/twig/node/event.php
View file

@ -18,6 +18,11 @@ if (!defined('IN_PHPBB'))
class phpbb_template_twig_node_event extends Twig_Node class phpbb_template_twig_node_event extends Twig_Node
{ {
/**
* The subdirectory in which all template event files must be placed
*/
const TEMPLATE_EVENTS_SUBDIRECTORY = 'events/';
/** @var Twig_Environment */ /** @var Twig_Environment */
protected $environment; protected $environment;
@ -50,19 +55,19 @@ class phpbb_template_twig_node_event extends Twig_Node
// slower, but makes developing extensions easier (no need to // slower, but makes developing extensions easier (no need to
// purge the cache when a new event template file is added) // purge the cache when a new event template file is added)
$compiler $compiler
->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n") ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')) {\n")
->indent() ->indent()
; ;
} }
if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html')) if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . self::TEMPLATE_EVENTS_SUBDIRECTORY . $location . '.html'))
{ {
$compiler $compiler
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n") ->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
// We set the namespace lookup order to be this extension first, then the main path // 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->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
->write("\$this->env->loadTemplate('@{$ext_namespace}/{$location}.html')->display(\$context);\n") ->write("\$this->env->loadTemplate('@{$ext_namespace}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')->display(\$context);\n")
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n") ->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
; ;
} }