diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-10 15:25:51 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-10 15:25:51 -0700 |
| commit | 63f327853a4c270ccf8362c01efb707e89b982d6 (patch) | |
| tree | 140a90a742ba883b233c6de153fdc163d095d016 /phpBB/includes/functions_acp.php | |
| parent | 12eaa82aff6b7f142e70f1bacc399d47010d8ee0 (diff) | |
| parent | 51cc7155041c95ca47147072c1c04449ad0bcf67 (diff) | |
| download | forums-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/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..c83bc1f7a6 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' => !empty($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']) ); |