diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-24 20:44:37 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-24 20:44:37 +0100 |
| commit | 17b00812a753d2e6790d003882ab3579d510e3f2 (patch) | |
| tree | 8d953df056b057fed229dc24d28f2840e0eb224e /phpBB/includes/acp/acp_prune.php | |
| parent | b57e00226a5d59a73cd4b47fc49675c495f2ac18 (diff) | |
| parent | 56cbff720d49c9ecc22549be2b2f742e539cd1c2 (diff) | |
| download | forums-17b00812a753d2e6790d003882ab3579d510e3f2.tar forums-17b00812a753d2e6790d003882ab3579d510e3f2.tar.gz forums-17b00812a753d2e6790d003882ab3579d510e3f2.tar.bz2 forums-17b00812a753d2e6790d003882ab3579d510e3f2.tar.xz forums-17b00812a753d2e6790d003882ab3579d510e3f2.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/acp/acp_prune.php')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index 5a97cf2169..63a103aa0c 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -508,7 +508,7 @@ class acp_prune 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) : '') . ' + ((!empty($user_ids)) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : '') . ' AND u.user_id = ug.user_id'; $result = $db->sql_query($sql); @@ -534,7 +534,7 @@ class acp_prune 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) : '') . ' + ((!empty($user_ids)) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . ' AND ' . $db->sql_in_set('p.post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . ' AND u.user_id = p.poster_id GROUP BY p.poster_id |