2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index e392bef157..3603224735 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -415,6 +415,10 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		$success_msg = 'POSTS_MERGED_SUCCESS';
 
 		// Update the topic watch table.
+		if (!function_exists('phpbb_update_rows_avoiding_duplicates'))
+		{
+			include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+		}
 		phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// Link to the new topic
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index f40a4bc044..1fb3cb9d73 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -620,6 +620,10 @@ function merge_posts($topic_id, $to_topic_id)
 		else
 		{
 			// If the topic no longer exist, we will update the topic watch table.
+			if (!function_exists('phpbb_update_rows_avoiding_duplicates'))
+			{
+				include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+			}
 			phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 		}