diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-10-21 17:38:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-21 17:38:53 +0200 |
commit | dfcc744275553df699a33dabf51f2c071bedfaaf (patch) | |
tree | 78dfbe5c40a6f26bff388ed56a9ccedbd0c316fb /phpBB/includes | |
parent | a671eaf25dcbc72f5e7ea1ffc852a59791e1de0b (diff) | |
parent | e78632767c3c9eb9fc8c2757d3e6e8b5f1d60ced (diff) | |
download | forums-dfcc744275553df699a33dabf51f2c071bedfaaf.tar forums-dfcc744275553df699a33dabf51f2c071bedfaaf.tar.gz forums-dfcc744275553df699a33dabf51f2c071bedfaaf.tar.bz2 forums-dfcc744275553df699a33dabf51f2c071bedfaaf.tar.xz forums-dfcc744275553df699a33dabf51f2c071bedfaaf.zip |
Merge pull request #5716 from marc1706/ticket/15437
[ticket/15437] Update jQuery and cookie consent to latest
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_acp.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index c2f173b345..3227a21e26 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4559,7 +4559,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'T_STYLESHEET_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/stylesheet.css?assets_version=' . $config['assets_version'], 'T_STYLESHEET_LANG_LINK'=> "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/' . $user->lang_name . '/stylesheet.css?assets_version=' . $config['assets_version'], 'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'], - 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery.min.js?assets_version=" . $config['assets_version'], + 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery-3.4.1.min.js?assets_version=" . $config['assets_version'], 'S_ALLOW_CDN' => !empty($config['allow_cdn']), 'S_COOKIE_NOTICE' => !empty($config['cookie_notice']), diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index a2014a7d5b..4926351461 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -177,7 +177,7 @@ 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 Limited'), - 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery.min.js", + 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery-3.4.1.min.js", 'S_ALLOW_CDN' => !empty($config['allow_cdn']), 'VERSION' => $config['version']) ); |