diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-12 12:32:56 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-12 12:32:56 -0500 |
| commit | 95884edf08d962d0f8cf764f4870f910d4d65009 (patch) | |
| tree | b232be0e02db672c101af35908dbff264d271e3b /phpBB/includes/template/twig/node/includejs.php | |
| parent | 612dbad63fa6f85fdaa0298e67f89d7c9010dbe6 (diff) | |
| download | forums-95884edf08d962d0f8cf764f4870f910d4d65009.tar forums-95884edf08d962d0f8cf764f4870f910d4d65009.tar.gz forums-95884edf08d962d0f8cf764f4870f910d4d65009.tar.bz2 forums-95884edf08d962d0f8cf764f4870f910d4d65009.tar.xz forums-95884edf08d962d0f8cf764f4870f910d4d65009.zip | |
[feature/twig] Correcting output of INCLUDEJS
PHPBB3-11598
Diffstat (limited to 'phpBB/includes/template/twig/node/includejs.php')
| -rw-r--r-- | phpBB/includes/template/twig/node/includejs.php | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php index e30ab75125..6fe8e155b7 100644 --- a/phpBB/includes/template/twig/node/includejs.php +++ b/phpBB/includes/template/twig/node/includejs.php @@ -1,22 +1,19 @@ <?php - -/* - * This file is part of Twig. - * - * (c) 2009 Fabien Potencier - * (c) 2009 Armin Ronacher - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - /** - * Represents an include node. - * - * @author Fabien Potencier <fabien@symfony.com> - */ -class phpbb_template_twig_node_includejs extends Twig_Node_Include +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_template_twig_node_includejs extends Twig_Node { + public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null) + { + parent::__construct(array('expr' => $expr), array(), $lineno, $tag); + } + /** * Compiles the node to PHP. * @@ -27,24 +24,8 @@ class phpbb_template_twig_node_includejs extends Twig_Node_Include $compiler->addDebugInfo($this); $compiler - ->write("try {\n") - ->indent() - ; - - $this->addGetTemplate($compiler); - - $compiler->raw('->display('); - - $this->addTemplateArguments($compiler); - - $compiler->raw(");\n"); - - $compiler - ->write("} catch (Twig_Error_Loader \$e) {\n") - ->indent() - ->write("// ignore missing template\n") - ->outdent() - ->write("}\n\n") - ; + ->write("\$context['SCRIPTS'] .= '<script type=\"text/javascript\" src=") + ->subcompile($this->getNode('expr')) + ->raw(">';\n\n"); } } |