From fce30d1d91d7e1e4a2c2989640d5c5176e7fada0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 16 Oct 2016 10:55:00 +0200 Subject: [PATCH] [ticket/14795] Use maximum topic views instead of adding up views in merge Merging topics should not result in topic views being added up but rather in the highest topic view showing up for the merged topic. PHPBB3-14795 --- phpBB/includes/mcp/mcp_forum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 7df712f65f..5e4dce2de7 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -424,7 +424,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) foreach ($topic_data as $data) { $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];