From 1a411c5658da769e28b03332ed618d5e701dab79 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 00:10:02 -0500
Subject: [PATCH] [ticket/11162] Use correct functions.

PHPBB3-11162
---
 phpBB/includes/mcp/mcp_forum.php | 4 ++--
 phpBB/includes/mcp/mcp_topic.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 3603224735..cd938e83a0 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -415,11 +415,11 @@ 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'))
+		if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 		{
 			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);
+		phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// 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>');
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 1fb3cb9d73..29dabdd2a2 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -620,11 +620,11 @@ 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'))
+			if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 			{
 				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);
+			phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 		}
 
 		// Link to the new topic