From 202478d1088def6e73fd0a9abc0bf951b7b13132 Mon Sep 17 00:00:00 2001
From: brunoais <brunoaiss@gmail.com>
Date: Thu, 26 Dec 2019 18:17:39 +0000
Subject: [ticket/16262] Fixing event's $current_row_number by renaming $i

PHPBB3-16262
---
 phpBB/includes/mcp/mcp_topic.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/mcp')

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 83ad56f3e4..77db5f3ed0 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -242,7 +242,7 @@ function mcp_topic_view($id, $mode, $action)
 	);
 	extract($phpbb_dispatcher->trigger_event('core.mcp_topic_modify_post_data', compact($vars)));
 
-	foreach ($rowset as $i => $row)
+	foreach ($rowset as $current_row_number => $row)
 	{
 		$message = $row['post_text'];
 		$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
@@ -336,7 +336,7 @@ function mcp_topic_view($id, $mode, $action)
 			}
 		}
 
-		unset($rowset[$i]);
+		unset($rowset[$current_row_number]);
 	}
 
 	// Display topic icons for split topic
-- 
cgit v1.2.1


From 80de9f6a68d7b50eb5387cdc2b99624484e75201 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 29 Dec 2019 18:56:36 +0700
Subject: [ticket/16277] Move from each() function

PHPBB3-16277
---
 phpBB/includes/mcp/mcp_logs.php  | 2 +-
 phpBB/includes/mcp/mcp_notes.php | 2 +-
 phpBB/includes/mcp/mcp_warn.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/mcp')

diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index 79f9d35ebe..dc098fceed 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -44,7 +44,7 @@ class mcp_logs
 
 		if (is_array($action))
 		{
-			list($action, ) = each($action);
+			$action = key($action);
 		}
 		else
 		{
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index a4c2356a43..74bd1f1f62 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -42,7 +42,7 @@ class mcp_notes
 
 		if (is_array($action))
 		{
-			list($action, ) = each($action);
+			$action = key($action);
 		}
 
 		$this->page_title = 'MCP_NOTES';
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index df175133fc..7a8599fedd 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -41,7 +41,7 @@ class mcp_warn
 
 		if (is_array($action))
 		{
-			list($action, ) = each($action);
+			$action = key($action);
 		}
 
 		$this->page_title = 'MCP_WARN';
-- 
cgit v1.2.1