diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-13 03:32:01 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-13 03:32:01 +0200 |
| commit | 790cc0c54f0f84235a556e4442c42d9d1d5f7195 (patch) | |
| tree | be60657cf39d33cf97c3386ca6f2bd2d885e8ede /phpBB/adm/style | |
| parent | 1828d74502c800acd9eb8b87438e628f59b10dad (diff) | |
| parent | 6ad58c7e046c9f257ad5441b7a583cddb213ad3f (diff) | |
| download | forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar.gz forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar.bz2 forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar.xz forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.zip | |
Merge remote-tracking branch 'github-callumacrae/ticket/10783' into develop
* github-callumacrae/ticket/10783:
[ticket/10783] Added assets_version to ACP and simple_*.html.
[ticket/10783] Added assets_version to subsilver2.
[ticket/10783] Added ?assets_version to assets.
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_header.html | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 0d88c8bcc5..2bc9ee52d7 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -37,8 +37,8 @@ </div> <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" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></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 ajax.js --> {SCRIPTS} diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index be5ac29131..f79c0318b5 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -5,7 +5,7 @@ <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> -<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" /> <script type="text/javascript"> // <![CDATA[ diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index b6d7ee2f5c..1d5c62b0a3 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -17,7 +17,7 @@ </div> <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" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<!-- 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 --> </body> </html> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 84ff665acc..d4cbcb6cbe 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -5,7 +5,7 @@ <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> -<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" /> <script type="text/javascript"> // <![CDATA[ |