mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-02 04:42:37 +02:00
Code Issues Releases Wiki Activity

Potential (display) support for global announcements ... various issues still need to addressed wrt posting/replying/etc.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3567 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-02-27 15:58:07 +00:00
parent ce4e06811c
commit 66062783ce
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/viewforum.php
View File

@@ -184,9 +184,6 @@ if ($forum_data['forum_postable'])
gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir);
// Limit topics to certain time frame, obtain correct topic count
$topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1;
$limit_topics_time = $topic_days = '';
if ($sort_days)
{
$min_topic_time = time() - ($sort_days * 86400);
@@ -205,6 +202,7 @@ if ($forum_data['forum_postable'])
else
{
$topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1;
$limit_topics_time = '';
}
// Select the sort order
@@ -263,7 +261,8 @@ if ($forum_data['forum_postable'])
FROM (' . TOPICS_TABLE . ' t
LEFT JOIN ' . LASTREAD_TABLE . ' lr ON lr.topic_id = t.topic_id
AND lr.user_id = ' . $user->data['user_id'] . ")
WHERE t.forum_id IN ($forum_id, 0)
WHERE (t.forum_id = $forum_id
OR t.forum_id = 0)
AND t.topic_type = " . POST_ANNOUNCE . "
ORDER BY $sort_order_sql
LIMIT " . $config['topics_per_page'];