diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 08:12:23 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 08:12:23 -0700 |
| commit | e31082b82cd2c9d03da5fe982f175636e975c2b8 (patch) | |
| tree | d4aa700841ce7a697786894a3c014f0ed7232385 /phpBB | |
| parent | 958f3e950309c6275ae2872ce9c29c89303cf7be (diff) | |
| parent | 1c1eecb376adfa40b50db96d76839cc81fc05537 (diff) | |
| download | forums-e31082b82cd2c9d03da5fe982f175636e975c2b8.tar forums-e31082b82cd2c9d03da5fe982f175636e975c2b8.tar.gz forums-e31082b82cd2c9d03da5fe982f175636e975c2b8.tar.bz2 forums-e31082b82cd2c9d03da5fe982f175636e975c2b8.tar.xz forums-e31082b82cd2c9d03da5fe982f175636e975c2b8.zip | |
Merge pull request #1675 from marc1706/ticket/11809
[ticket/11809] Ensure code.js is first script included after jQuery
Diffstat (limited to 'phpBB')
| -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 b948d9f627..15a298053b 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -58,8 +58,8 @@ <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> <!-- INCLUDEJS forum_fn.js --> -<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js --> <!-- INCLUDEJS ajax.js --> <!-- EVENT overall_footer_after --> diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index d2b30c22a0..348db5d309 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -13,7 +13,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 --> -<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js --> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- EVENT overall_footer_after --> |