mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-21 17:11:53 +02:00
Code Issues Releases Wiki Activity

[ticket/11162] Add includes.

Browse Source 
PHPBB3-11162
This commit is contained in:
Oleg Pudeyev
2012-12-04 23:37:14 -05:00
parent 0f96b1aad3
commit abca64b1df
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,6 +415,10 @@ 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'))
{
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($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
// Link to the new topic // Link to the new topic

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

@@ -620,6 +620,10 @@ 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'))
{
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($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
} }