3 files changed, 30 insertions, 12 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index fc28968101..9696605450 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -322,6 +322,22 @@ function lock_unlock($action, $ids)
 			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_' . strtoupper($action), $row['topic_title']);
 		}
 
+		/**
+		 * Perform additional actions after locking/unlocking posts/topics
+		 *
+		 * @event core.mcp_lock_unlock_after
+		 * @var	string	action				Variable containing the action we perform on the posts/topics ('lock', 'unlock', 'lock_post' or 'unlock_post')
+		 * @var	array	ids					Array containing the post/topic IDs that have been locked/unlocked
+		 * @var	array	data				Array containing posts/topics data
+		 * @since 3.1.7-RC1
+		 */
+		$vars = array(
+			'action',
+			'ids',
+			'data',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.mcp_lock_unlock_after', compact($vars)));
+
 		$success_msg = $l_prefix . ((sizeof($ids) == 1) ? '' : 'S') . '_' . (($action == 'lock' || $action == 'lock_post') ? 'LOCKED' : 'UNLOCKED') . '_SUCCESS';
 
 		meta_refresh(2, $redirect);
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 7a93f73228..2dcfcd608b 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -549,16 +549,6 @@ function change_poster(&$post_info, $userdata)
 	$from_username = $post_info['username'];
 	$to_username = $userdata['username'];
 
-	// Renew post info
-	$post_info = phpbb_get_post_data(array($post_id), false, true);
-
-	if (!sizeof($post_info))
-	{
-		trigger_error('POST_NOT_EXIST');
-	}
-
-	$post_info = $post_info[$post_id];
-
 	/**
 	* This event allows you to perform additional tasks after changing a post's poster
 	*
@@ -566,10 +556,21 @@ function change_poster(&$post_info, $userdata)
 	* @var	array	userdata	Information on a post's new poster
 	* @var	array	post_info	Information on the affected post
 	* @since 3.1.6-RC1
+	* @changed 3.1.7-RC1		Change location to prevent post_info from being set to the new post information
 	*/
 	$vars = array('userdata', 'post_info');
 	extract($phpbb_dispatcher->trigger_event('core.mcp_change_poster_after', compact($vars)));
 
+	// Renew post info
+	$post_info = phpbb_get_post_data(array($post_id), false, true);
+
+	if (!sizeof($post_info))
+	{
+		trigger_error('POST_NOT_EXIST');
+	}
+
+	$post_info = $post_info[$post_id];
+
 	// Now add log entry
 	add_log('mod', $post_info['forum_id'], $post_info['topic_id'], 'LOG_MCP_CHANGE_POSTER', $post_info['topic_title'], $from_username, $to_username);
 }
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 4b3e16d713..3567e545f0 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -72,6 +72,7 @@ class mcp_queue
 			case 'delete':
 				$post_id_list = $request->variable('post_id_list', array(0));
 				$topic_id_list = $request->variable('topic_id_list', array(0));
+				$delete_reason = $request->variable('delete_reason', '', true);
 
 				if (!empty($post_id_list))
 				{
@@ -80,7 +81,7 @@ class mcp_queue
 						global $phpbb_root_path, $phpEx;
 						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx);
 					}
-					mcp_delete_post($post_id_list, false, '', $action);
+					mcp_delete_post($post_id_list, false, $delete_reason, $action);
 				}
 				else if (!empty($topic_id_list))
 				{
@@ -89,7 +90,7 @@ class mcp_queue
 						global $phpbb_root_path, $phpEx;
 						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx);
 					}
-					mcp_delete_topic($topic_id_list, false, '', $action);
+					mcp_delete_topic($topic_id_list, false, $delete_reason, $action);
 				}
 				else
 				{