aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-10-10 15:25:51 -0700
committerNils Adermann <naderman@naderman.de>2013-10-10 15:25:51 -0700
commit63f327853a4c270ccf8362c01efb707e89b982d6 (patch)
tree140a90a742ba883b233c6de153fdc163d095d016 /phpBB/styles/prosilver/template
parent12eaa82aff6b7f142e70f1bacc399d47010d8ee0 (diff)
parent51cc7155041c95ca47147072c1c04449ad0bcf67 (diff)
downloadforums-63f327853a4c270ccf8362c01efb707e89b982d6.tar
forums-63f327853a4c270ccf8362c01efb707e89b982d6.tar.gz
forums-63f327853a4c270ccf8362c01efb707e89b982d6.tar.bz2
forums-63f327853a4c270ccf8362c01efb707e89b982d6.tar.xz
forums-63f327853a4c270ccf8362c01efb707e89b982d6.zip
Merge pull request #1569 from bantu/ticket/11703
[ticket/11703] Make jQuery CDN switch more generic.
Diffstat (limited to 'phpBB/styles/prosilver/template')
-rw-r--r--phpBB/styles/prosilver/template/overall_footer.html2
-rw-r--r--phpBB/styles/prosilver/template/simple_footer.html2
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 15a298053b..e26c94f367 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -57,7 +57,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?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><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 ajax.js -->
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index b6afc2fdba..10edece3cd 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -7,7 +7,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?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><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 forum_fn.js -->
<!-- EVENT simple_footer_after -->