2 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 7aaff2a562..79282c0358 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -664,6 +664,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 			{
 				delete_posts($where_type, $_where_ids, $auto_sync, $posted_sync, $post_count_sync, $call_delete_topics);
 			}
+
+			return;
 		}*/
 
 		$where_clause = $db->sql_in_set($where_type, $where_ids);
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 0b02da054a..05653f7e3b 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1763,8 +1763,14 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
 	$url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm');
 	$next_history_pm = $previous_history_pm = $prev_id = 0;
 
-	foreach ($rowset as $id => $row)
+	// Re-order rowset to be able to get the next/prev message rows...
+	$rowset = array_values($rowset);
+
+	for ($i = 0, $size = sizeof($rowset); $i < $size; $i++)
 	{
+		$row = &$rowset[$i];
+		$id = (int) $row['msg_id'];
+
 		$author_id	= $row['author_id'];
 		$folder_id	= (int) $row['folder_id'];
 
@@ -1795,8 +1801,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
 
 		if ($id == $msg_id)
 		{
-			$next_history_pm = next($rowset);
-			$next_history_pm = (sizeof($next_history_pm)) ? (int) $next_history_pm['msg_id'] : 0;
+			$next_history_pm = (isset($rowset[$i + 1])) ? (int) $rowset[$i + 1]['msg_id'] : 0;
 			$previous_history_pm = $prev_id;
 		}