diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-08-30 22:57:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-30 22:57:00 +0200 |
| commit | c03d692a98fafa921a832e063c76a3d844632ca7 (patch) | |
| tree | 68111ed107e013d0264a87fce0826fd5706e3167 /phpBB/search.php | |
| parent | 625e7ef58aab1b2d61505f756d53c7d85d9f2d2b (diff) | |
| download | forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar.gz forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar.bz2 forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar.xz forums-c03d692a98fafa921a832e063c76a3d844632ca7.zip | |
[feature/soft-delete] Fix some more usages of _approved column names
PHPBB3-9657
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index e6eab724bb..8365a96fa2 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -249,23 +249,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) } $db->sql_freeresult($result); -/* // find out in which forums the user is allowed to view approved posts - if ($auth->acl_get('m_approve')) - { - $m_approve_fid_ary = array(-1); - $m_approve_fid_sql = ''; - } - else if ($auth->acl_getf_global('m_approve')) - { - $m_approve_fid_ary = array_diff(array_keys($auth->acl_getf('!m_approve', true)), $ex_fid_ary); - $m_approve_fid_sql = ' AND (p.post_approved = 1' . ((sizeof($m_approve_fid_ary)) ? ' OR ' . $db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) : '') . ')'; - } - else - { - $m_approve_fid_ary = array(); - $m_approve_fid_sql = ' AND p.post_approved = 1'; - } -*/ + // find out in which forums the user is allowed to view posts $m_approve_posts_fid_sql = phpbb_content_visibility::get_visibility_sql_global('post', $ex_fid_ary, 'p.'); $m_approve_topics_fid_sql = phpbb_content_visibility::get_visibility_sql_global('topic', $ex_fid_ary, 't.'); |