diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-10 22:26:16 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-10 22:26:16 +0200 |
| commit | 2c65b9b133ffc3ee958ce9d5a579f7d58741292d (patch) | |
| tree | f32f1a43bbc3c60b36c9cc94b71f6d29a12a7b75 | |
| parent | dfb7bb1de198628b071ae78d59c0c63244a2a303 (diff) | |
| parent | 3d18d6dc77f090b8d6d4a7bc908d03f3ad719321 (diff) | |
| download | forums-2c65b9b133ffc3ee958ce9d5a579f7d58741292d.tar forums-2c65b9b133ffc3ee958ce9d5a579f7d58741292d.tar.gz forums-2c65b9b133ffc3ee958ce9d5a579f7d58741292d.tar.bz2 forums-2c65b9b133ffc3ee958ce9d5a579f7d58741292d.tar.xz forums-2c65b9b133ffc3ee958ce9d5a579f7d58741292d.zip | |
Merge pull request #3699 from nickvergessen/ticket/13823
[ticket/13823] Move the part of the query, so the update will get it …
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index c68f26fc13..e17399e3d9 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -506,9 +506,9 @@ class acp_prune WHERE ug.group_id = ' . (int) $group_id . ' AND ug.user_id <> ' . ANONYMOUS . ' AND u.user_type <> ' . USER_FOUNDER . ' - AND ug.user_pending = 0 ' . - (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : '') . ' - AND u.user_id = ug.user_id'; + AND ug.user_pending = 0 + AND u.user_id = ug.user_id + ' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : ''); $result = $db->sql_query($sql); // we're performing an intersection operation, so all the relevant users @@ -532,10 +532,10 @@ class acp_prune $sql = 'SELECT u.user_id, u.username, COUNT(p.post_id) AS queue_posts FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u WHERE u.user_id <> ' . ANONYMOUS . ' - AND u.user_type <> ' . USER_FOUNDER . - (!empty($user_ids) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . ' + AND u.user_type <> ' . USER_FOUNDER . ' AND ' . $db->sql_in_set('p.post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . ' AND u.user_id = p.poster_id + ' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . ' GROUP BY p.poster_id HAVING queue_posts ' . $key_match[$queue_select] . ' ' . $posts_on_queue; $result = $db->sql_query($sql); |