aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_acp.php
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2011-09-25 15:12:56 -0700
committerMatt Friedman <maf675@gmail.com>2011-09-26 11:15:22 -0700
commit56c6476233646e7c735aa4e3b98c4a6b62df5c7d (patch)
treefb428fc655e39150c57f1a23f027443b3d6c2e87 /phpBB/includes/functions_acp.php
parent5e768036f773e461283d0f65841d2ff0618ec7b7 (diff)
downloadforums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar
forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar.gz
forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar.bz2
forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar.xz
forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.zip
[ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Add an option to the ACP so admins can choose to host jQuery from the local version shipped with phpBB, or via a popular CDN. PHPBB3-10390
Diffstat (limited to 'phpBB/includes/functions_acp.php')
-rw-r--r--phpBB/includes/functions_acp.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index c3806dc786..4f9fa0db5e 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -126,6 +126,8 @@ function adm_page_footer($copyright_html = true)
'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '',
'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
'S_COPYRIGHT_HTML' => $copyright_html,
+ 'T_JQUERY_LINK' => (!empty($config['load_jquery_host']) && $config['load_jquery_host'] != 'localhost') ? remote_jquery_url($config['load_jquery_host']) : "{$phpbb_root_path}assets/javascript/jquery.js",
+ 'S_JQUERY_FALLBACK' => (!empty($config['load_jquery_host']) && $config['load_jquery_host'] != 'localhost') ? true : false,
'VERSION' => $config['version'])
);