mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00
Code Issues Releases Wiki Activity

[feature/twig] Fix <!-- .blah since the being node was changed

Browse Source 
PHPBB3-11598
This commit is contained in:
Nathan Guse
2013-06-24 12:52:55 -05:00
parent c958155fb6
commit 63143a1a57
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/template/twig/node/event.php
View File

@@ -27,8 +27,6 @@ class phpbb_template_twig_node_event extends Twig_Node
{ {
$compiler->addDebugInfo($this); $compiler->addDebugInfo($this);
$compiler->indent();
$location = $this->getNode('expr')->getAttribute('name'); $location = $this->getNode('expr')->getAttribute('name');
foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path) foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)

7
phpBB/includes/template/twig/twig.php
View File

@@ -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 // cleanup
unset($vars['_phpbb_blocks']['.']); unset($vars['_phpbb_blocks']['.']);