Merge pull request #6167 from 3D-I/ticket/16719

[ticket/16719] Fix PHP notice/warnings on update/install - PHP 8
This commit is contained in:
Marc Alexander 2021-04-04 16:54:41 +02:00 committed by GitHub
commit e1a6ed45bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -247,7 +247,10 @@ define('BANLIST_TABLE', $table_prefix . 'banlist');
define('BBCODES_TABLE', $table_prefix . 'bbcodes'); define('BBCODES_TABLE', $table_prefix . 'bbcodes');
define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks');
define('BOTS_TABLE', $table_prefix . 'bots'); 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('CONFIG_TEXT_TABLE', $table_prefix . 'config_text');
define('CONFIRM_TABLE', $table_prefix . 'confirm'); define('CONFIRM_TABLE', $table_prefix . 'confirm');
define('DISALLOW_TABLE', $table_prefix . 'disallow'); define('DISALLOW_TABLE', $table_prefix . 'disallow');

View file

@ -16,10 +16,7 @@
*/ */
define('IN_PHPBB', true); define('IN_PHPBB', true);
define('IN_INSTALL', true); define('IN_INSTALL', true);
if (!defined('PHPBB_ENVIRONMENT'))
{
define('PHPBB_ENVIRONMENT', 'production');
}
$phpbb_root_path = '../'; $phpbb_root_path = '../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);