From ffb0adfc59934dd6012394855f494872276b61b9 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sat, 21 Dec 2019 23:54:32 +0100
Subject: [PATCH 1/3] [ticket/16260] Missing check whether the index exists in
ACP - PHP 7.4
PHPBB3-16260
---
phpBB/includes/acp/acp_board.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 2441a37edc..b0cefbd064 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -530,11 +530,13 @@ class acp_board
if ($submit)
{
- if (strpos($data['type'], 'password') === 0 && $config_value === '********')
+ if (strpos(isset($data['type']) ? $data['type'] : '', 'password') === 0 && $config_value === '********')
{
- // Do not update password fields if the content is ********,
- // because that is the password replacement we use to not
- // send the password to the output
+ /**
+ * Do not update password fields if the content is ********,
+ * because that is the password replacement we use to not
+ * send the password to the output
+ */
continue;
}
$config->set($config_name, $config_value);
From 16a163662bf463d7fa2195e73832e8bf4a26a06f Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sun, 22 Dec 2019 17:44:03 +0100
Subject: [PATCH 2/3] [ticket/16260] Missing check whether the index exists in
ACP - PHP 7.4
PHPBB3-16260
---
phpBB/includes/acp/acp_board.php | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index b0cefbd064..2285ac997e 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -530,15 +530,19 @@ class acp_board
if ($submit)
{
- if (strpos(isset($data['type']) ? $data['type'] : '', 'password') === 0 && $config_value === '********')
+ if (isset($data['type']))
{
- /**
- * Do not update password fields if the content is ********,
- * because that is the password replacement we use to not
- * send the password to the output
- */
- continue;
+ if (strpos($data['type'], 'password') === 0 && $config_value === '********')
+ {
+ /**
+ * Do not update password fields if the content is ********,
+ * because that is the password replacement we use to not
+ * send the password to the output
+ */
+ continue;
+ }
}
+
$config->set($config_name, $config_value);
if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable']))
From dbc164e13188a8adf4478c1b4b3ce563e16486c3 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sun, 22 Dec 2019 21:03:35 +0100
Subject: [PATCH 3/3] [ticket/16260] Missing check whether the index exists in
ACP - PHP 7.4
PHPBB3-16260
---
phpBB/includes/acp/acp_board.php | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 2285ac997e..cd72a8748a 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -530,17 +530,14 @@ class acp_board
if ($submit)
{
- if (isset($data['type']))
+ if (isset($data['type']) && strpos($data['type'], 'password') === 0 && $config_value === '********')
{
- if (strpos($data['type'], 'password') === 0 && $config_value === '********')
- {
- /**
- * Do not update password fields if the content is ********,
- * because that is the password replacement we use to not
- * send the password to the output
- */
- continue;
- }
+ /**
+ * Do not update password fields if the content is ********,
+ * because that is the password replacement we use to not
+ * send the password to the output
+ */
+ continue;
}
$config->set($config_name, $config_value);