makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] INCLUDEJS now uses the definition class

Browse source 
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
This commit is contained in:
Nathaniel Guse 2013-07-02 10:13:16 -05:00
parent 883b0a9f8c
commit 156d5c671f
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/includes/template/twig/definition.php
View file

@ -47,4 +47,23 @@ class phpbb_template_twig_definition
return $this;
}
/**
* Append to a variable
*
* @param string $name
* @param string $value
* @return phpbb_template_twig_definition
*/
public function append($name, $value)
{
if (!isset($this->definitions[$name]))
{
$this->definitions[$name] = '';
}
$this->definitions[$name] .= $value;
return $this;
}
}

4
phpBB/includes/template/twig/node/includejs.php
View file

@ -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")
;
}
}

2
phpBB/styles/prosilver/template/overall_footer.html
View file

@ -56,7 +56,7 @@
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS {T_TEMPLATE_PATH}/ajax.js -->
{SCRIPTS}
{$SCRIPTS}
<!-- EVENT overall_footer_after -->
</body>

2
phpBB/styles/subsilver2/template/overall_footer.html
View file

@ -14,7 +14,7 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
{SCRIPTS}
{$SCRIPTS}
<!-- EVENT overall_footer_after -->
</body>