diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-07-17 14:34:36 -0500 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-29 17:50:12 +0200 |
| commit | 1ab41f8dc6ec81f2aaf152229d5f0275de796c85 (patch) | |
| tree | a1b85dd17c49b8f588bb2d41d1e6750830920f2e /phpBB/includes/mcp/mcp_queue.php | |
| parent | f570558a8da65596b0ca2700e2e7829548d2393a (diff) | |
| download | forums-1ab41f8dc6ec81f2aaf152229d5f0275de796c85.tar forums-1ab41f8dc6ec81f2aaf152229d5f0275de796c85.tar.gz forums-1ab41f8dc6ec81f2aaf152229d5f0275de796c85.tar.bz2 forums-1ab41f8dc6ec81f2aaf152229d5f0275de796c85.tar.xz forums-1ab41f8dc6ec81f2aaf152229d5f0275de796c85.zip | |
[feature/soft-delete] Fix some small bugs
To wit: using non-existing constant POST_DELETED in posting.php; first test
post was initially unapproved; soft delete checkbox appeared at post time
Links pointing to the wrong place.
PHPBB3-9657
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 597be855b7..6c36084e68 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -322,6 +322,7 @@ class mcp_queue if ($mode == 'unapproved_posts' || $mode == 'deleted_posts') { $visibility_const = ($mode == 'unapproved_posts') ? ITEM_UNAPPROVED : ITEM_DELETED; + $starter_sql = ($mode == 'unapproved_posts') ? 'AND t.topic_first_post_id <> p.post_id' : ''; $sql = 'SELECT p.post_id FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . ' @@ -330,7 +331,7 @@ class mcp_queue ' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . ' ' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . " AND t.topic_id = p.topic_id - AND t.topic_first_post_id <> p.post_id + $starter_sql $limit_time_sql ORDER BY $sort_order_sql"; $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); |