aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_main.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-11-09 13:37:53 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-11-09 13:37:53 +0100
commit9c2a58eff4c2bd164ee3bdb2ec66729d4562963d (patch)
treede37766616cc7473b4590a77e1c660f433eab1ce /phpBB/includes/mcp/mcp_main.php
parentdac798deffde15f3cb0383f5aa06a266aa9bc6cd (diff)
downloadforums-9c2a58eff4c2bd164ee3bdb2ec66729d4562963d.tar
forums-9c2a58eff4c2bd164ee3bdb2ec66729d4562963d.tar.gz
forums-9c2a58eff4c2bd164ee3bdb2ec66729d4562963d.tar.bz2
forums-9c2a58eff4c2bd164ee3bdb2ec66729d4562963d.tar.xz
forums-9c2a58eff4c2bd164ee3bdb2ec66729d4562963d.zip
[feature/soft-delete] Append _approved to *_posts and *_topics column names
PHPBB3-9567
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
-rw-r--r--phpBB/includes/mcp/mcp_main.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 945b80ba41..aeaa37f4cb 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -494,7 +494,7 @@ function mcp_move_topic($topic_ids)
$topics_moved_softdeleted++;
}
- $posts_moved += $topic_info['topic_posts'];
+ $posts_moved += $topic_info['topic_posts_approved'];
$posts_moved_unapproved += $topic_info['topic_posts_unapproved'];
$posts_moved_softdeleted += $topic_info['topic_posts_softdeleted'];
}
@@ -534,7 +534,7 @@ 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_posts' => (int) $row['topic_posts'],
+ 'topic_posts_approved' => (int) $row['topic_posts_approved'],
'topic_posts_unapproved'=> (int) $row['topic_posts_unapproved'],
'topic_posts_softdeleted'=> (int) $row['topic_posts_softdeleted'],
'topic_status' => ITEM_MOVED,
@@ -1180,7 +1180,7 @@ 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_posts' => (int) $topic_row['topic_posts'],
+ 'topic_posts_approved' => (int) $topic_row['topic_posts_approved'],
'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'],