diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-08-23 15:12:23 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-13 17:07:33 +0200 |
| commit | 1c1eecb376adfa40b50db96d76839cc81fc05537 (patch) | |
| tree | 1a185a4f8c458391277511b233fed5ceb3b95b99 /phpBB | |
| parent | b7b862d721da3f72c4b9cb0a88ae9ca4707a323d (diff) | |
| download | forums-1c1eecb376adfa40b50db96d76839cc81fc05537.tar forums-1c1eecb376adfa40b50db96d76839cc81fc05537.tar.gz forums-1c1eecb376adfa40b50db96d76839cc81fc05537.tar.bz2 forums-1c1eecb376adfa40b50db96d76839cc81fc05537.tar.xz forums-1c1eecb376adfa40b50db96d76839cc81fc05537.zip | |
[ticket/11809] Ensure code.js is first script included after jQuery
The file core.js sets up most of the AJAX and jQuery related framework for
phpBB. Due to this, it needs to be included before any other javascript file
in order to ensure that subsequent files can use the phpBB variables and
functions. Currently, it is however loaded with INCLUDEJS in overall_footer
which causes it to be loaded after every other javascript file except for the
style specific ajax.js. This causes every javascript file that is included
before core.js and is using the phpBB AJAX functions or variables to break.
PHPBB3-11809
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 --> |