mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-14 04:42:04 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2016-10-01 16:58:07 +01:00
commit 328a7afcc3
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,9 +428,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
}
$sync_forums = array();
$topic_views = 0;
foreach ($topic_data as $data)
{
$sync_forums[$data['forum_id']] = $data['forum_id'];
$topic_views += $data['topic_views'];
}
$topic_data = $topic_data[$to_topic_id];
@ -491,6 +493,12 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
$topic_data['topic_title']
));
// Update topic views count
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_views = ' . $topic_views . '
WHERE topic_id = ' . $to_topic_id;
$db->sql_query($sql);
// Message and return links
$success_msg = 'POSTS_MERGED_SUCCESS';