diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-11 14:10:58 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-25 11:52:22 +0200 |
| commit | 2ec9c08a2bce2cb83c68339d2d07039cabc44d68 (patch) | |
| tree | 17e48c56e526046f0e1d34f157e3791e67be435a /phpBB/mcp.php | |
| parent | dac01e8ca534b4d145d99e49a6aee173b85925f5 (diff) | |
| download | forums-2ec9c08a2bce2cb83c68339d2d07039cabc44d68.tar forums-2ec9c08a2bce2cb83c68339d2d07039cabc44d68.tar.gz forums-2ec9c08a2bce2cb83c68339d2d07039cabc44d68.tar.bz2 forums-2ec9c08a2bce2cb83c68339d2d07039cabc44d68.tar.xz forums-2ec9c08a2bce2cb83c68339d2d07039cabc44d68.zip | |
[ticket/12052] Use different visibility when post was edited
... and needs to be reapproved.
PHPBB3-12052
Diffstat (limited to 'phpBB/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 1449346deb..d77dfbd227 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'; @@ -687,6 +687,7 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, 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('topic_visibility', $visibility_const) .' AND t.topic_id = p.topic_id AND t.topic_visibility <> p.post_visibility'; @@ -698,7 +699,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 +707,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) { |