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/tokenparser | |
| 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/tokenparser')
| -rw-r--r-- | phpBB/includes/template/twig/tokenparser/includejs.php | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php index 36a1fcb585..efa8692f4b 100644 --- a/phpBB/includes/template/twig/tokenparser/includejs.php +++ b/phpBB/includes/template/twig/tokenparser/includejs.php @@ -1,25 +1,13 @@ <?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. - */ - /** - * Includes a template. - * - * <pre> - * {% include 'header.html' %} - * Body - * {% include 'footer.html' %} - * </pre> - */ -class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser_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_tokenparser_includejs extends Twig_TokenParser { /** * Parses a token and returns a node. @@ -32,9 +20,10 @@ class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser_Include { $expr = $this->parser->getExpressionParser()->parseExpression(); - list($variables, $only, $ignoreMissing) = $this->parseArguments(); + $stream = $this->parser->getStream(); + $stream->expect(Twig_Token::BLOCK_END_TYPE); - return new phpbb_template_twig_node_includejs($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); + return new phpbb_template_twig_node_includejs($expr, $token->getLine(), $this->getTag()); } /** |