From 0f7b89838a3222555b94d164ffaa7492b663461e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Bartus?= <mate.bartus@gmail.com>
Date: Sun, 31 Jan 2021 14:21:37 +0100
Subject: [PATCH] [ticket/16643] Remove dbms_version config setting
PHPBB3-16643
---
phpBB/includes/acp/acp_main.php | 6 ---
.../includes/questionnaire/questionnaire.php | 1 -
phpBB/install/schemas/schema_data.sql | 1 -
.../data/v400/remove_dbms_version_config.php | 38 +++++++++++++++++++
.../task/add_config_settings.php | 2 -
5 files changed, 38 insertions(+), 10 deletions(-)
create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_dbms_version_config.php
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 4abc176d19..4986e3db8f 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -690,12 +690,6 @@ class acp_main
]);
}
- // Fill dbms version if not yet filled
- if (empty($config['dbms_version']))
- {
- $config->set('dbms_version', $db->sql_server_info(true));
- }
-
$this->tpl_name = 'acp_main';
$this->page_title = 'ACP_MAIN';
}
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index a2b301401b..6792ae39b7 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -326,7 +326,6 @@ class phpbb_questionnaire_phpbb_data_provider
'cookie_secure' => true,
'coppa_enable' => true,
'database_gc' => true,
- 'dbms_version' => true,
'default_dateformat' => true,
'default_lang' => true,
'display_last_edited' => true,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 4724520c6b..e6a3187a79 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -94,7 +94,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable', '0'
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('database_gc', '604800');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('dbms_version', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_lang', 'en');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_search_return_chars', '300');
diff --git a/phpBB/phpbb/db/migration/data/v400/remove_dbms_version_config.php b/phpBB/phpbb/db/migration/data/v400/remove_dbms_version_config.php
new file mode 100644
index 0000000000..bc3f1a3c5a
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v400/remove_dbms_version_config.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v400;
+
+use phpbb\db\migration\migration;
+
+class remove_dbms_version_config extends migration
+{
+ public function effectively_installed()
+ {
+ return !$this->config->offsetExists('dbms_version');
+ }
+
+ public function update_data()
+ {
+ return [
+ ['config.remove', ['dbms_version']],
+ ];
+ }
+
+ static public function depends_on()
+ {
+ return [
+ '\phpbb\db\migration\data\v30x\release_3_0_3_rc1',
+ ];
+ }
+}
diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
index 15e46c9b02..190ad8c907 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
@@ -164,8 +164,6 @@ class add_config_settings extends database_task
'sitename' => $this->install_config->get('board_name'),
'site_desc' => $this->install_config->get('board_description'),
-
- 'dbms_version' => $this->db->sql_server_info(true),
];
if (@extension_loaded('gd'))