aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_main.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-10-22 14:55:10 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-10-22 14:55:10 +0200
commit5925a17894cecb9fdf2d5c58dcdeb533fb80e8f7 (patch)
tree631492f0676970371ea538d881fbe89997fed1aa /phpBB/includes/mcp/mcp_main.php
parent168dd29f24843e97182c894a5d43a7d38f8a195c (diff)
downloadforums-5925a17894cecb9fdf2d5c58dcdeb533fb80e8f7.tar
forums-5925a17894cecb9fdf2d5c58dcdeb533fb80e8f7.tar.gz
forums-5925a17894cecb9fdf2d5c58dcdeb533fb80e8f7.tar.bz2
forums-5925a17894cecb9fdf2d5c58dcdeb533fb80e8f7.tar.xz
forums-5925a17894cecb9fdf2d5c58dcdeb533fb80e8f7.zip
[feature/soft-delete] Fix some more uses of topic_replies_real
PHPBB3-9567
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
-rw-r--r--phpBB/includes/mcp/mcp_main.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index a90fc0891e..3ccd1695ad 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -541,8 +541,9 @@ function mcp_move_topic($topic_ids)
'topic_time' => (int) $row['topic_time'],
'topic_time_limit' => (int) $row['topic_time_limit'],
'topic_views' => (int) $row['topic_views'],
- 'topic_replies' => (int) $row['topic_replies'],
- 'topic_replies_real' => (int) $row['topic_replies_real'],
+ 'topic_posts' => (int) $row['topic_posts'],
+ 'topic_posts_unapproved'=> (int) $row['topic_posts_unapproved'],
+ 'topic_posts_softdeleted'=> (int) $row['topic_posts_softdeleted'],
'topic_status' => ITEM_MOVED,
'topic_type' => POST_NORMAL,
'topic_first_post_id' => (int) $row['topic_first_post_id'],
@@ -574,6 +575,7 @@ function mcp_move_topic($topic_ids)
}
unset($topic_data);
+ //@todo: needs fixing
if ($topic_posts_removed)
{
$sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . $topic_posts_removed;
@@ -937,8 +939,9 @@ function mcp_fork_topic($topic_ids)
'topic_title' => (string) $topic_row['topic_title'],
'topic_poster' => (int) $topic_row['topic_poster'],
'topic_time' => (int) $topic_row['topic_time'],
- 'topic_replies' => (int) $topic_row['topic_replies_real'],
- 'topic_replies_real' => (int) $topic_row['topic_replies_real'],
+ 'topic_posts' => (int) $topic_row['topic_posts'],
+ 'topic_posts_unapproved' => (int) $topic_row['topic_posts_unapproved'],
+ 'topic_posts_softdeleted' => (int) $topic_row['topic_posts_softdeleted'],
'topic_status' => (int) $topic_row['topic_status'],
'topic_type' => (int) $topic_row['topic_type'],
'topic_first_poster_name' => (string) $topic_row['topic_first_poster_name'],