diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-07 18:02:47 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-07 18:02:47 +0200 |
| commit | 9777abaed465d08bb8018661d210c2d92ae4870e (patch) | |
| tree | b10a09bab0df623c649def23f6d3df1f3d5e3b9a | |
| parent | 6817418b06e3697df4f2643f9c7ed8f7d5d604b2 (diff) | |
| parent | 25c4c481d74f2272218fced8506cb7861eec8a75 (diff) | |
| download | forums-9777abaed465d08bb8018661d210c2d92ae4870e.tar forums-9777abaed465d08bb8018661d210c2d92ae4870e.tar.gz forums-9777abaed465d08bb8018661d210c2d92ae4870e.tar.bz2 forums-9777abaed465d08bb8018661d210c2d92ae4870e.tar.xz forums-9777abaed465d08bb8018661d210c2d92ae4870e.zip | |
Merge branch '3.1.x'
| -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 63a103aa0c..e2f1378418 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 |