diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-11-06 15:47:20 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-11-06 15:47:20 +0100 |
| commit | 9be9062df358aa6744b5764ac841a6b685d3ad6a (patch) | |
| tree | 431fd59bdb0bad943eccdadf4f69fc8e37eec78b /phpBB/includes | |
| parent | dc32b900c58943df25ae5085c96ad47fc6e67c61 (diff) | |
| parent | fce30d1d91d7e1e4a2c2989640d5c5176e7fada0 (diff) | |
| download | forums-9be9062df358aa6744b5764ac841a6b685d3ad6a.tar forums-9be9062df358aa6744b5764ac841a6b685d3ad6a.tar.gz forums-9be9062df358aa6744b5764ac841a6b685d3ad6a.tar.bz2 forums-9be9062df358aa6744b5764ac841a6b685d3ad6a.tar.xz forums-9be9062df358aa6744b5764ac841a6b685d3ad6a.zip | |
Merge pull request #4485 from marc1706/ticket/14795
[ticket/14795] Use maximum topic views instead of adding up views in merge
* github.com:phpbb/phpbb:
[ticket/14795] Use maximum topic views instead of adding up views in merge
Diffstat (limited to 'phpBB/includes')
| -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 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]; |