6 files changed, 41 insertions, 15 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 8d2d70bd3b..e63888e70e 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -378,14 +378,22 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		return;
 	}
 
-	$topic_data = get_topic_data(array($to_topic_id), 'm_merge');
+	$sync_topics = array_merge($topic_ids, array($to_topic_id));
 
-	if (!sizeof($topic_data))
+	$topic_data = get_topic_data($sync_topics, 'm_merge');
+
+	if (!sizeof($topic_data) || empty($topic_data[$to_topic_id]))
 	{
 		$template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']);
 		return;
 	}
 
+	$sync_forums = array();
+	foreach ($topic_data as $data)
+	{
+		$sync_forums[$data['forum_id']] = $data['forum_id'];
+	}
+
 	$topic_data = $topic_data[$to_topic_id];
 
 	$post_id_list	= request_var('post_id_list', array(0));
@@ -436,7 +444,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 	{
 		$to_forum_id = $topic_data['forum_id'];
 
-		move_posts($post_id_list, $to_topic_id);
+		move_posts($post_id_list, $to_topic_id, false);
 		add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']);
 
 		// Message and return links
@@ -453,6 +461,12 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		// Update the bookmarks table.
 		phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
+		// Re-sync the topics and forums because the auto-sync was deactivated in the call of  move_posts()
+		sync('topic_reported', 'topic_id', $sync_topics);
+		sync('topic_attachment', 'topic_id', $sync_topics);
+		sync('topic', 'topic_id', $sync_topics, true);
+		sync('forum', 'forum_id', $sync_forums, true, true);
+
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
 		$redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&amp;t=$to_topic_id");
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index a0c1bc02ec..2945e1ec8a 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -115,9 +115,8 @@ class mcp_logs
 				if ($deletemark && sizeof($marked))
 				{
 					$conditions = array(
-						'log_type'	=> LOG_MOD,
 						'forum_id'	=> $forum_list,
-						'log_id'	=> $marked,
+						'log_id'	=> array('IN' => $marked),
 					);
 
 					$phpbb_log->delete('mod', $conditions);
@@ -127,7 +126,6 @@ class mcp_logs
 					$keywords = utf8_normalize_nfc(request_var('keywords', '', true));
 
 					$conditions = array(
-						'log_type'	=> LOG_MOD,
 						'forum_id'	=> $forum_list,
 						'keywords'	=> $keywords,
 					);
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 9d1afb7dc5..84097327bd 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -496,11 +496,11 @@ function mcp_move_topic($topic_ids)
 			{
 				$topics_moved++;
 			}
-			elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE)
+			else if ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE)
 			{
 				$topics_moved_unapproved++;
 			}
-			elseif ($topic_info['topic_visibility'] == ITEM_DELETED)
+			else if ($topic_info['topic_visibility'] == ITEM_DELETED)
 			{
 				$topics_moved_softdeleted++;
 			}
@@ -567,7 +567,7 @@ function mcp_move_topic($topic_ids)
 					'topic_last_poster_id'	=>	(int) $row['topic_last_poster_id'],
 					'topic_last_poster_colour'=>(string) $row['topic_last_poster_colour'],
 					'topic_last_poster_name'=>	(string) $row['topic_last_poster_name'],
-					'topic_last_post_subject'=>	(string)  $row['topic_last_post_subject'],
+					'topic_last_post_subject'=>	(string) $row['topic_last_post_subject'],
 					'topic_last_post_time'	=>	(int) $row['topic_last_post_time'],
 					'topic_last_view_time'	=>	(int) $row['topic_last_view_time'],
 					'topic_moved_id'		=>	(int) $row['topic_id'],
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 5dd39dbf0f..e2ca3a8752 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -655,7 +655,7 @@ class mcp_queue
 					if (!$post_data['topic_posts_approved'])
 					{
 						$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
-						
+
 						if ($post_data['post_visibility'] == ITEM_UNAPPROVED)
 						{
 							$phpbb_notifications->add_notifications(array('topic'), $post_data);
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index f045fd018f..b0148356ce 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -489,7 +489,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 	{
 		$redirect = request_var('redirect', build_url(array('mode', 'r', 'quickmod')) . '&amp;mode=reports');
 	}
-	elseif ($action == 'delete' && strpos($user->data['session_page'], 'mode=pm_report_details') !== false)
+	else if ($action == 'delete' && strpos($user->data['session_page'], 'mode=pm_report_details') !== false)
 	{
 		$redirect = request_var('redirect', build_url(array('mode', 'r', 'quickmod')) . '&amp;mode=pm_reports');
 	}
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 51802f1e4d..f8ce8aae7b 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -592,14 +592,22 @@ function merge_posts($topic_id, $to_topic_id)
 		return;
 	}
 
-	$topic_data = get_topic_data(array($to_topic_id), 'm_merge');
+	$sync_topics = array($topic_id, $to_topic_id);
 
-	if (!sizeof($topic_data))
+	$topic_data = get_topic_data($sync_topics, 'm_merge');
+
+	if (!sizeof($topic_data) || empty($topic_data[$to_topic_id]))
 	{
 		$template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']);
 		return;
 	}
 
+	$sync_forums = array();
+	foreach ($topic_data as $data)
+	{
+		$sync_forums[$data['forum_id']] = $data['forum_id'];
+	}
+
 	$topic_data = $topic_data[$to_topic_id];
 
 	$post_id_list	= request_var('post_id_list', array(0));
@@ -634,7 +642,7 @@ function merge_posts($topic_id, $to_topic_id)
 	{
 		$to_forum_id = $topic_data['forum_id'];
 
-		move_posts($post_id_list, $to_topic_id);
+		move_posts($post_id_list, $to_topic_id, false);
 		add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']);
 
 		// Message and return links
@@ -642,7 +650,7 @@ function merge_posts($topic_id, $to_topic_id)
 
 		// Does the original topic still exist? If yes, link back to it
 		$sql = 'SELECT forum_id
-			FROM ' . TOPICS_TABLE . '
+			FROM ' . POSTS_TABLE . '
 			WHERE topic_id = ' . $topic_id;
 		$result = $db->sql_query_limit($sql, 1);
 		$row = $db->sql_fetchrow($result);
@@ -666,6 +674,12 @@ function merge_posts($topic_id, $to_topic_id)
 			phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', array($topic_id), $to_topic_id);
 		}
 
+		// Re-sync the topics and forums because the auto-sync was deactivated in the call of move_posts()
+		sync('topic_reported', 'topic_id', $sync_topics);
+		sync('topic_attachment', 'topic_id', $sync_topics);
+		sync('topic', 'topic_id', $sync_topics, true);
+		sync('forum', 'forum_id', $sync_forums, true, true);
+
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
 		$redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&amp;t=$to_topic_id");