aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-11-10 11:24:52 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-11-10 11:24:52 +0100
commitf77a6eaab5485329a3b13922649fb8902e6e397f (patch)
tree903d9aa277fc8c015886af1f9be0a96930b0de4c /phpBB/includes/acp/acp_users.php
parent9c2a58eff4c2bd164ee3bdb2ec66729d4562963d (diff)
downloadforums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.gz
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.bz2
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.xz
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.zip
[feature/soft-delete] Fix the rest of *_approved and the delete_post unit test
PHPBB3-9567
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1a3511bc50..bb5b4a04d5 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -636,14 +636,14 @@ class acp_users
if (sizeof($topic_id_ary))
{
- $sql = 'SELECT topic_id, forum_id, topic_title, topic_posts, topic_posts_unapproved, topic_posts_softdeleted, topic_attachment
+ $sql = 'SELECT topic_id, forum_id, topic_title, topic_posts_approved, topic_posts_unapproved, topic_posts_softdeleted, topic_attachment
FROM ' . TOPICS_TABLE . '
WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
- if ($topic_id_ary[$row['topic_id']][ITEM_APPROVED] == $row['topic_posts']
+ if ($topic_id_ary[$row['topic_id']][ITEM_APPROVED] == $row['topic_posts_approved']
&& $topic_id_ary[$row['topic_id']][ITEM_UNAPPROVED] == $row['topic_posts_unapproved']
&& $topic_id_ary[$row['topic_id']][ITEM_DELETED] == $row['topic_posts_softdeleted'])
{