mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-27 10:14:47 +02:00
Code Issues Releases Wiki Activity

[ticket/9657] Remove sql_visibility as it is always non-empty

Browse Source 
PHPBB3-9657
This commit is contained in:
Joas Schilling
2013-07-11 22:35:55 -04:00
parent 53c0647aed
commit 5ab0090e6c
6 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/viewforum.php
View File

@@ -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'])
{