diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:11:09 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:11:09 +0200 |
| commit | d36795b844d54fbb05f923540c06970bf270caea (patch) | |
| tree | 137bedc6f4d629e8ab74ccd1cf1f9116f5717c5e /phpBB/includes/acp/acp_prune.php | |
| parent | 73b950d2f191eb5590c43df6c555f1f217b3b2ee (diff) | |
| parent | 5c7199f3dd1e0dd99c173f90ada615c68d486f51 (diff) | |
| download | forums-d36795b844d54fbb05f923540c06970bf270caea.tar forums-d36795b844d54fbb05f923540c06970bf270caea.tar.gz forums-d36795b844d54fbb05f923540c06970bf270caea.tar.bz2 forums-d36795b844d54fbb05f923540c06970bf270caea.tar.xz forums-d36795b844d54fbb05f923540c06970bf270caea.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop-ascraeus
* github-nickvergessen/ticket/12371:
[ticket/12371] Fix language string
[ticket/12371] Fix typos in comment
[ticket/12371] Fix redirect link for approve_post and post_in_queue
[ticket/12371] Delete the approve_post notification when editing a post
[ticket/12371] Fix language in comment
[ticket/12371] Reapprove the post and topic again in tests
[ticket/12371] Correctly set is_starter when editing first post of the topic
[ticket/12371] Add functional tests for reapproving
[ticket/12371] Fix query in mcp_sorting()
[ticket/12371] Rename disapprove and softdelete tests
[ticket/12371] We do not group quote notifications anymore
[ticket/12371] Fix SQL query
[ticket/11772] Do not send out new topic/post notifications when reapproving
[ticket/12052] Use different visibility when post was edited
[ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
[ticket/12371] Do not add unlimited users as responders
[ticket/12371] Do not update the notification entry unneccessarily
[ticket/12371] Do not delete post related notifications when a post is deleted
[ticket/12371] Allow notification types to redirect to a different url
[ticket/12371] Do not group "quote" notifications
Diffstat (limited to 'phpBB/includes/acp/acp_prune.php')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index cefb63ce87..3850e7efe7 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -533,7 +533,7 @@ class acp_prune 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 p.post_visibility = ' . ITEM_UNAPPROVED . ' + 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 HAVING queue_posts ' . $key_match[$queue_select] . ' ' . $posts_on_queue; |