diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-23 20:56:58 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-23 20:56:58 +0200 |
| commit | 90a8e1dd1c8714f1e7da658a7401e782f6313fe4 (patch) | |
| tree | 6608300abee27c730ce74dfa072572fdc2835765 /phpBB/includes | |
| parent | b0b3810aab2474fdd7ea93c98da0ef01c9958dfd (diff) | |
| parent | 396a8214db6654947f0cceeca85f60c1edae6ffe (diff) | |
| download | forums-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.tar forums-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.tar.gz forums-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.tar.bz2 forums-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.tar.xz forums-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.zip | |
Merge branch 'prep-release-3.3.0-b1' into 3.3.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_acp.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 9f7a325a2b..a817ec1e72 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.3.0-b1-dev'); +@define('PHPBB_VERSION', '3.3.0-b1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e1f6fa3d1b..3227a21e26 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3395,7 +3395,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) $log_text .= '<br /><br />BACKTRACE<br />' . $backtrace; } - if (defined('IN_INSTALL') || $phpbb_container->getParameter('debug.show_errors') || isset($auth) && $auth->acl_get('a_')) + if (defined('IN_INSTALL') || ($phpbb_container != null && $phpbb_container->getParameter('debug.show_errors')) || isset($auth) && $auth->acl_get('a_')) { $msg_text = $log_text; @@ -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']) ); |