diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-24 20:44:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-24 20:44:15 +0100 |
| commit | 56cbff720d49c9ecc22549be2b2f742e539cd1c2 (patch) | |
| tree | ecfb1033b67e5e379ed21b324a2bf0f9bb7eb9e6 /phpBB | |
| parent | 525a62f72e872f8d19e2ec3f2e1c105e9fae4f75 (diff) | |
| parent | 80e1c233d94c982f13ccbc7ec56b2b8e5381b784 (diff) | |
| download | forums-56cbff720d49c9ecc22549be2b2f742e539cd1c2.tar forums-56cbff720d49c9ecc22549be2b2f742e539cd1c2.tar.gz forums-56cbff720d49c9ecc22549be2b2f742e539cd1c2.tar.bz2 forums-56cbff720d49c9ecc22549be2b2f742e539cd1c2.tar.xz forums-56cbff720d49c9ecc22549be2b2f742e539cd1c2.zip | |
Merge pull request #3439 from RMcGirr83/ticket/13587
[ticket/13587] SQL syntax errors in get_prune_users()
Diffstat (limited to 'phpBB')
| -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 59f15c4890..6eb213fd7a 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -507,7 +507,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); @@ -533,7 +533,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 |