From 465d0b1a4c665468e188381f6e83376bfde9422a Mon Sep 17 00:00:00 2001 From: Paul Sohier Date: Fri, 3 May 2019 22:45:53 +0200 Subject: [ticket/16043] Check if not null before getting anything from the container This is only happening when there is basicly an error during init of the container. PHPBB3-16043 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e1f6fa3d1b..c2f173b345 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 .= '

BACKTRACE
' . $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; -- cgit v1.2.1 From e78632767c3c9eb9fc8c2757d3e6e8b5f1d60ced Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Oct 2019 21:35:45 +0200 Subject: [ticket/15437] Rename jquery.min.js to jquery-3.4.1.min.js PHPBB3-15437 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e1f6fa3d1b..e2eca625f0 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']), -- cgit v1.2.1