diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-11 22:35:55 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-11 22:35:55 -0400 |
| commit | 5ab0090e6c9fa1b497938a932cdf28ba55a17e7c (patch) | |
| tree | 7e9222e8e8004ff9ee59a1525db0de7226de6327 /phpBB/viewforum.php | |
| parent | 53c0647aed4a4995d3ae00ed775ff563eaa61b9a (diff) | |
| download | forums-5ab0090e6c9fa1b497938a932cdf28ba55a17e7c.tar forums-5ab0090e6c9fa1b497938a932cdf28ba55a17e7c.tar.gz forums-5ab0090e6c9fa1b497938a932cdf28ba55a17e7c.tar.bz2 forums-5ab0090e6c9fa1b497938a932cdf28ba55a17e7c.tar.xz forums-5ab0090e6c9fa1b497938a932cdf28ba55a17e7c.zip | |
[ticket/9657] Remove sql_visibility as it is always non-empty
PHPBB3-9657
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 4128fbdfeb..926670f9bf 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -252,7 +252,6 @@ $phpbb_content_visibility = $phpbb_container->get('content.visibility'); if ($sort_days) { $min_post_time = time() - ($sort_days * 86400); - $sql_visibility = $phpbb_content_visibility->get_visibility_sql('topic', $forum_id); $sql = 'SELECT COUNT(topic_id) AS num_topics FROM ' . TOPICS_TABLE . " @@ -260,7 +259,7 @@ if ($sort_days) AND (topic_last_post_time >= $min_post_time OR topic_type = " . POST_ANNOUNCE . ' OR topic_type = ' . POST_GLOBAL . ') - ' . (($sql_visibility) ? ' AND ' . $sql_visibility : ''); + AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id); $result = $db->sql_query($sql); $topics_count = (int) $db->sql_fetchfield('num_topics'); $db->sql_freeresult($result); @@ -373,8 +372,7 @@ $sql_array = array( 'LEFT_JOIN' => array(), ); -$sql_approved = $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.'); -$sql_approved = ($sql_approved) ? ' AND ' . $sql_approved : ''; +$sql_approved = ' AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.'); if ($user->data['is_registered']) { |