diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-11-06 15:47:49 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-11-06 15:47:49 +0100 |
| commit | 50f5efba9cee542d6660b403c52c8a82dc9bbedf (patch) | |
| tree | 390a5cfa4f6ff77c967e4f60f0c227eadc8db2e8 | |
| parent | cd348b200a6d3711eee6b8f028d9c7caef268e5f (diff) | |
| parent | 9be9062df358aa6744b5764ac841a6b685d3ad6a (diff) | |
| download | forums-50f5efba9cee542d6660b403c52c8a82dc9bbedf.tar forums-50f5efba9cee542d6660b403c52c8a82dc9bbedf.tar.gz forums-50f5efba9cee542d6660b403c52c8a82dc9bbedf.tar.bz2 forums-50f5efba9cee542d6660b403c52c8a82dc9bbedf.tar.xz forums-50f5efba9cee542d6660b403c52c8a82dc9bbedf.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14795] Use maximum topic views instead of adding up views in merge
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index bc42b0660c..6a5fe98b4c 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -432,7 +432,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]; |