diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-02 10:13:16 -0500 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-02 10:13:16 -0500 |
commit | 156d5c671fb9db28fbbdcacb974093c2c52b0f5b (patch) | |
tree | 7e6cf4ae101e15793c8b6dfabc5de2ec874c78ee /phpBB/styles | |
parent | 883b0a9f8c3e102db8965069899dc2b97d1eb1ff (diff) | |
download | forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar.gz forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar.bz2 forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.tar.xz forums-156d5c671fb9db28fbbdcacb974093c2c52b0f5b.zip |
[feature/twig] INCLUDEJS now uses the definition class
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
Diffstat (limited to 'phpBB/styles')
-rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 2 | ||||
-rw-r--r-- | phpBB/styles/subsilver2/template/overall_footer.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 5422cc7c10..dcb8058ee1 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -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> diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 3a29a0d752..2d794d9f71 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -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> |