diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-02 17:06:12 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-02 17:13:47 +0100 |
| commit | 94f87d931854bf25fb051a27be9a1883510389c4 (patch) | |
| tree | dcde6d5edd7e649eba057becb89d6d4dba5cfd48 | |
| parent | b432f33b49e142cadc3643c4255192d4c10cc14c (diff) | |
| download | forums-94f87d931854bf25fb051a27be9a1883510389c4.tar forums-94f87d931854bf25fb051a27be9a1883510389c4.tar.gz forums-94f87d931854bf25fb051a27be9a1883510389c4.tar.bz2 forums-94f87d931854bf25fb051a27be9a1883510389c4.tar.xz forums-94f87d931854bf25fb051a27be9a1883510389c4.zip | |
[ticket/14446] Add predefined placeholder variables to twig definition
PHPBB3-14446
| -rw-r--r-- | phpBB/phpbb/template/twig/definition.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includeasset.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/phpbb/template/twig/definition.php b/phpBB/phpbb/template/twig/definition.php index cb3c953692..205f0e68ee 100644 --- a/phpBB/phpbb/template/twig/definition.php +++ b/phpBB/phpbb/template/twig/definition.php @@ -19,7 +19,10 @@ namespace phpbb\template\twig; class definition { /** @var array **/ - protected $definitions = array(); + protected $definitions = array( + 'SCRIPTS' => '__SCRIPTS_PLACEHOLDER__', + 'STYLESHEETS' => '__STYLESHEETS_PLACEHOLDER__' + ); /** * Get a DEFINE'd variable diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index 3d3c6e4df8..6d50eafc9d 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -53,8 +53,6 @@ abstract class includeasset extends \Twig_Node ->write("\$asset->add_assets_version('{$config['assets_version']}');\n") ->outdent() ->write("}\n") - ->write("\$context['definition']->set('STYLESHEETS', '__STYLESHEETS_PLACEHOLDER__');\n") - ->write("\$context['definition']->set('SCRIPTS', '__SCRIPTS_PLACEHOLDER__');\n") ->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);") ; } |