From 222c7cd74be24dfb88eafcf48484080fa1f85f81 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Fri, 19 Mar 2021 10:38:08 +0100 Subject: [PATCH 1/3] [ticket/16719] Fix PHP notice/warning on update PHPBB3-16719 --- phpBB/install/app.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpBB/install/app.php b/phpBB/install/app.php index 36d16e914b..25386b5038 100644 --- a/phpBB/install/app.php +++ b/phpBB/install/app.php @@ -17,9 +17,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); if (!defined('PHPBB_ENVIRONMENT')) -{ - define('PHPBB_ENVIRONMENT', 'production'); -} + $phpbb_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); From b6f4f3001582fad1f57a028040f137e4083698da Mon Sep 17 00:00:00 2001 From: 3D-I Date: Fri, 19 Mar 2021 10:42:34 +0100 Subject: [PATCH 2/3] [ticket/16719] Fix PHP notice/warning on update PHPBB3-16719 --- phpBB/install/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/install/app.php b/phpBB/install/app.php index 25386b5038..bf2c81bfcc 100644 --- a/phpBB/install/app.php +++ b/phpBB/install/app.php @@ -16,7 +16,6 @@ */ define('IN_PHPBB', true); define('IN_INSTALL', true); -if (!defined('PHPBB_ENVIRONMENT')) $phpbb_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); From 8e5be03fe94d2de53697a140dc73b7257c825169 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Sat, 20 Mar 2021 19:33:38 +0100 Subject: [PATCH 3/3] [ticket/16719] Fix PHP notice/warning on update PHPBB3-16719 --- phpBB/includes/constants.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 65f1b07fd8..3d35280671 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -247,7 +247,10 @@ define('BANLIST_TABLE', $table_prefix . 'banlist'); define('BBCODES_TABLE', $table_prefix . 'bbcodes'); define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); define('BOTS_TABLE', $table_prefix . 'bots'); -@define('CONFIG_TABLE', $table_prefix . 'config'); +if (!defined('CONFIG_TABLE')) +{ + define('CONFIG_TABLE', $table_prefix . 'config'); +} define('CONFIG_TEXT_TABLE', $table_prefix . 'config_text'); define('CONFIRM_TABLE', $table_prefix . 'confirm'); define('DISALLOW_TABLE', $table_prefix . 'disallow');