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_users.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_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 2f97011c70..89e5c7451c 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -657,6 +657,7 @@ class acp_users { if ($topic_id_ary[$row['topic_id']][ITEM_APPROVED] == $row['topic_posts_approved'] && $topic_id_ary[$row['topic_id']][ITEM_UNAPPROVED] == $row['topic_posts_unapproved'] + && $topic_id_ary[$row['topic_id']][ITEM_REAPPROVE] == $row['topic_posts_unapproved'] && $topic_id_ary[$row['topic_id']][ITEM_DELETED] == $row['topic_posts_softdeleted']) { $move_topic_ary[] = $row['topic_id']; @@ -1049,7 +1050,7 @@ class acp_users $sql = 'SELECT COUNT(post_id) as posts_in_queue FROM ' . POSTS_TABLE . ' WHERE poster_id = ' . $user_id . ' - AND post_visibility = ' . ITEM_UNAPPROVED; + AND ' . $db->sql_in_set('post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)); $result = $db->sql_query($sql); $user_row['posts_in_queue'] = (int) $db->sql_fetchfield('posts_in_queue'); $db->sql_freeresult($result); |