diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-01 16:58:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-01 16:58:02 +0100 |
| commit | 5a6933fee7d50c58b739c786bc4c01b61af5ebce (patch) | |
| tree | 667223944a2420d034d64414dc5c4e8d6a9969c9 | |
| parent | f1eda6868f069bcb680a6bb38247c4625c93cae2 (diff) | |
| parent | c588332aa51788d92361ad7dc3c27bd82b4889c9 (diff) | |
| download | forums-5a6933fee7d50c58b739c786bc4c01b61af5ebce.tar forums-5a6933fee7d50c58b739c786bc4c01b61af5ebce.tar.gz forums-5a6933fee7d50c58b739c786bc4c01b61af5ebce.tar.bz2 forums-5a6933fee7d50c58b739c786bc4c01b61af5ebce.tar.xz forums-5a6933fee7d50c58b739c786bc4c01b61af5ebce.zip | |
Merge pull request #4466 from Senky/ticket/14795
[ticket/14795] Merge topic views when merging topics
| -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 9573ecbe0d..7df712f65f 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -420,9 +420,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]; @@ -478,6 +480,12 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) move_posts($post_id_list, $to_topic_id, false); add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $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'; |