diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-10 11:24:52 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-10 11:24:52 +0100 |
| commit | f77a6eaab5485329a3b13922649fb8902e6e397f (patch) | |
| tree | 903d9aa277fc8c015886af1f9be0a96930b0de4c /phpBB/includes/mcp/mcp_queue.php | |
| parent | 9c2a58eff4c2bd164ee3bdb2ec66729d4562963d (diff) | |
| download | forums-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/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index ab2d5124af..e56aa17ee8 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -305,11 +305,11 @@ class mcp_queue trigger_error('NOT_MODERATOR'); } - $sql = 'SELECT SUM(forum_topics) as sum_forum_topics + $sql = 'SELECT SUM(forum_topics_approved) as sum_forum_topics FROM ' . FORUMS_TABLE . ' WHERE ' . $db->sql_in_set('forum_id', $forum_list); $result = $db->sql_query($sql); - $forum_info['forum_topics'] = (int) $db->sql_fetchfield('sum_forum_topics'); + $forum_info['forum_topics_approved'] = (int) $db->sql_fetchfield('sum_forum_topics'); $db->sql_freeresult($result); } else @@ -336,7 +336,7 @@ class mcp_queue $sort_by_sql = $sort_order_sql = array(); mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id); - $forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total; + $forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total; $limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : ''; $forum_names = array(); |