diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-01 16:58:07 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-01 16:58:07 +0100 |
| commit | 328a7afcc3307f4c53bceb3ce733c832b503aafb (patch) | |
| tree | 958d4d55e40e55cd2a32107f240c574b7169c3d3 /phpBB/includes/mcp | |
| parent | 57fc321c4df7c3151cc350abf3fb7e1cc4af1584 (diff) | |
| parent | 5a6933fee7d50c58b739c786bc4c01b61af5ebce (diff) | |
| download | forums-328a7afcc3307f4c53bceb3ce733c832b503aafb.tar forums-328a7afcc3307f4c53bceb3ce733c832b503aafb.tar.gz forums-328a7afcc3307f4c53bceb3ce733c832b503aafb.tar.bz2 forums-328a7afcc3307f4c53bceb3ce733c832b503aafb.tar.xz forums-328a7afcc3307f4c53bceb3ce733c832b503aafb.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index e381210331..bc42b0660c 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -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'; |