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/mcp.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/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 1449346deb..3c6953b37c 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -677,7 +677,7 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, case 'unapproved_posts': case 'deleted_posts': - $visibility_const = ($mode == 'unapproved_posts') ? ITEM_UNAPPROVED : ITEM_DELETED; + $visibility_const = ($mode == 'unapproved_posts') ? array(ITEM_UNAPPROVED, ITEM_REAPPROVE) : ITEM_DELETED; $type = 'posts'; $default_key = 't'; $default_dir = 'd'; @@ -686,7 +686,7 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, $sql = 'SELECT COUNT(p.post_id) AS total FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t $where_sql " . $db->sql_in_set('p.forum_id', ($forum_id) ? array($forum_id) : array_intersect(get_forum_list('f_read'), get_forum_list('m_approve'))) . ' - AND p.post_visibility = ' . $visibility_const . ' + AND ' . $db->sql_in_set('p.post_visibility', $visibility_const) .' AND t.topic_id = p.topic_id AND t.topic_visibility <> p.post_visibility'; @@ -698,7 +698,7 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, case 'unapproved_topics': case 'deleted_topics': - $visibility_const = ($mode == 'unapproved_topics') ? ITEM_UNAPPROVED : ITEM_DELETED; + $visibility_const = ($mode == 'unapproved_topics') ? array(ITEM_UNAPPROVED, ITEM_REAPPROVE) : ITEM_DELETED; $type = 'topics'; $default_key = 't'; $default_dir = 'd'; @@ -706,7 +706,7 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, $sql = 'SELECT COUNT(topic_id) AS total FROM ' . TOPICS_TABLE . " $where_sql " . $db->sql_in_set('forum_id', ($forum_id) ? array($forum_id) : array_intersect(get_forum_list('f_read'), get_forum_list('m_approve'))) . ' - AND topic_visibility = ' . $visibility_const; + AND ' . $db->sql_in_set('topic_visibility', $visibility_const); if ($min_time) { |