aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template/twig/node/includejs.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-02 10:13:16 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-02 10:13:16 -0500
commit156d5c671fb9db28fbbdcacb974093c2c52b0f5b (patch)
tree7e6cf4ae101e15793c8b6dfabc5de2ec874c78ee /phpBB/includes/template/twig/node/includejs.php
parent883b0a9f8c3e102db8965069899dc2b97d1eb1ff (diff)
downloadforums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar
forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar.gz
forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar.bz2
forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar.xz
forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.zip
[feature/twig] INCLUDEJS now uses the definition class
This had to be done because, like DEFINE, setting variables to $context only affected the local file and any children, not parent templates. PHPBB3-11598
Diffstat (limited to 'phpBB/includes/template/twig/node/includejs.php')
-rw-r--r--phpBB/includes/template/twig/node/includejs.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index f4c26affa4..bba5d4ef91 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -31,9 +31,9 @@ class phpbb_template_twig_node_includejs extends Twig_Node
$config = $this->environment->get_phpbb_config();
$compiler
- ->write("\$context['SCRIPTS'] .= '<script type=\"text/javascript\" src=\"' . ")
+ ->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
->subcompile($this->getNode('expr'))
- ->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>';\n\n")
+ ->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>');\n")
;
}
}