diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 23:37:14 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 23:37:14 -0500 |
| commit | abca64b1dfbe11f73675a3e5457fb9f0038f1cb6 (patch) | |
| tree | b19b1ae38bb1eed5b50572db1539b30785499883 | |
| parent | 0f96b1aad378b1fc40620ea57df5ee89224fd5eb (diff) | |
| download | forums-abca64b1dfbe11f73675a3e5457fb9f0038f1cb6.tar forums-abca64b1dfbe11f73675a3e5457fb9f0038f1cb6.tar.gz forums-abca64b1dfbe11f73675a3e5457fb9f0038f1cb6.tar.bz2 forums-abca64b1dfbe11f73675a3e5457fb9f0038f1cb6.tar.xz forums-abca64b1dfbe11f73675a3e5457fb9f0038f1cb6.zip | |
[ticket/11162] Add includes.
PHPBB3-11162
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 4 |
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); } |