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

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/14795] Use maximum topic views instead of adding up views in merge
This commit is contained in:
Tristan Darricau 2016-11-06 15:47:56 +01:00
commit 3364a54f39
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,7 +432,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
foreach ($topic_data as $data) foreach ($topic_data as $data)
{ {
$sync_forums[$data['forum_id']] = $data['forum_id']; $sync_forums[$data['forum_id']] = $data['forum_id'];
$topic_views += $data['topic_views']; $topic_views = max($topic_views, $data['topic_views']);
} }
$topic_data = $topic_data[$to_topic_id]; $topic_data = $topic_data[$to_topic_id];