diff options
| author | Matt Friedman <maf675@gmail.com> | 2011-09-26 20:26:32 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2011-09-27 11:12:11 -0700 |
| commit | 2dca3c3c278e99cfd6cdbea7149063d160e4cc11 (patch) | |
| tree | 0e561f4bdeb04085115a70bb4d33d32322ecfcfa /phpBB/includes/functions_acp.php | |
| parent | 2a28b6fc401e4481a3a4eb6085b45b9bd7746f43 (diff) | |
| download | forums-2dca3c3c278e99cfd6cdbea7149063d160e4cc11.tar forums-2dca3c3c278e99cfd6cdbea7149063d160e4cc11.tar.gz forums-2dca3c3c278e99cfd6cdbea7149063d160e4cc11.tar.bz2 forums-2dca3c3c278e99cfd6cdbea7149063d160e4cc11.tar.xz forums-2dca3c3c278e99cfd6cdbea7149063d160e4cc11.zip | |
[ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.
PHPBB3-10390
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 4f9fa0db5e..142be083a7 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -126,8 +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, + 'T_JQUERY_LINK' => ($config['load_jquery_cdn'] && !empty($config['load_jquery_url'])) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery.js", + 'S_JQUERY_FALLBACK' => ($config['load_jquery_cdn']) ? true : false, 'VERSION' => $config['version']) ); |