diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-24 12:52:55 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-24 12:52:55 -0500 |
| commit | 63143a1a576b9707dfc997038a5aaf804d5f8d8e (patch) | |
| tree | 7c64c8c1430d932b4b917412b0e3f3c65ffcfeeb /phpBB/includes | |
| parent | c958155fb63667e1d54d6d31489bf17c0a180dab (diff) | |
| download | forums-63143a1a576b9707dfc997038a5aaf804d5f8d8e.tar forums-63143a1a576b9707dfc997038a5aaf804d5f8d8e.tar.gz forums-63143a1a576b9707dfc997038a5aaf804d5f8d8e.tar.bz2 forums-63143a1a576b9707dfc997038a5aaf804d5f8d8e.tar.xz forums-63143a1a576b9707dfc997038a5aaf804d5f8d8e.zip | |
[feature/twig] Fix <!-- .blah since the being node was changed
PHPBB3-11598
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/template/twig/node/event.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/template/twig/twig.php | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php index cedfa870fa..12e6ef1329 100644 --- a/phpBB/includes/template/twig/node/event.php +++ b/phpBB/includes/template/twig/node/event.php @@ -27,8 +27,6 @@ class phpbb_template_twig_node_event extends Twig_Node { $compiler->addDebugInfo($this); - $compiler->indent(); - $location = $this->getNode('expr')->getAttribute('name'); foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path) diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php index 92eeb6d913..15e49df200 100644 --- a/phpBB/includes/template/twig/twig.php +++ b/phpBB/includes/template/twig/twig.php @@ -431,6 +431,13 @@ class phpbb_template_twig implements phpbb_template ) ); + // Must do this so that <!-- IF .blah --> works correctly + // (only for the base loops, the rest are properly handled by the begin node) + foreach ($this->context->get_tpldata() as $block_name => $block_values) + { + $vars[$block_name] = !empty($block_values); + } + // cleanup unset($vars['_phpbb_blocks']['.']); |