makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11162] Use correct functions.

Browse source 
PHPBB3-11162
This commit is contained in:
Oleg Pudeyev 2012-12-05 00:10:02 -05:00
parent 6872104aa9
commit 1a411c5658
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/mcp/mcp_forum.php
View file

@ -415,11 +415,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
$success_msg = 'POSTS_MERGED_SUCCESS'; $success_msg = 'POSTS_MERGED_SUCCESS';
// Update the topic watch table. // 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); 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 // 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>'); $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>');

4
phpBB/includes/mcp/mcp_topic.php
View file

@ -620,11 +620,11 @@ function merge_posts($topic_id, $to_topic_id)
else else
{ {
// If the topic no longer exist, we will update the topic watch table. // 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); 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 // Link to the new topic