diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-14 20:44:00 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-10 23:26:03 +0200 |
| commit | 94b49d8a925e4bc7f10cbcf117ba81b071019b73 (patch) | |
| tree | 9fcdef0455377e7f4c130578a0bef8e8d689e57b /phpBB/includes/functions_acp.php | |
| parent | b59131f558a6d0fe4c836e2658152c8698f0cd22 (diff) | |
| download | forums-94b49d8a925e4bc7f10cbcf117ba81b071019b73.tar forums-94b49d8a925e4bc7f10cbcf117ba81b071019b73.tar.gz forums-94b49d8a925e4bc7f10cbcf117ba81b071019b73.tar.bz2 forums-94b49d8a925e4bc7f10cbcf117ba81b071019b73.tar.xz forums-94b49d8a925e4bc7f10cbcf117ba81b071019b73.zip | |
[ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN
PHPBB3-11703
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 60c44e90e1..3ca0049a1c 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -175,8 +175,8 @@ function adm_page_footer($copyright_html = true) 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'), - '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, + 'T_JQUERY_LINK' => ($config['allow_cdn'] && !empty($config['load_jquery_url'])) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery.js", + 'S_ALLOW_CDN' => !empty($config['allow_cdn']), 'VERSION' => $config['version']) ); |
