mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
oops, simple case of "idiotitis paulicus" ... be gone double announcements
git-svn-id: file:///svn/phpbb/trunk@3549 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
ea1b4dcd14
commit
2dee304b0e
1 changed files with 2 additions and 2 deletions
|
@ -264,7 +264,7 @@ if ($forum_data['forum_postable'])
|
||||||
|
|
||||||
// if (empty($forum_data['topics_list']))
|
// if (empty($forum_data['topics_list']))
|
||||||
// {
|
// {
|
||||||
$sql = 'SELECT t.*, lr.lastread_time, lr.lastread_type
|
$sql = 'SELECT t.*, lr.lastread_time, lr.lastread_type
|
||||||
FROM (' . TOPICS_TABLE . ' t
|
FROM (' . TOPICS_TABLE . ' t
|
||||||
LEFT JOIN ' . LASTREAD_TABLE . ' lr ON lr.topic_id = t.topic_id
|
LEFT JOIN ' . LASTREAD_TABLE . ' lr ON lr.topic_id = t.topic_id
|
||||||
AND lr.user_id = ' . $user->data['user_id'] . ")
|
AND lr.user_id = ' . $user->data['user_id'] . ")
|
||||||
|
@ -288,6 +288,7 @@ if ($forum_data['forum_postable'])
|
||||||
AND lr.user_id = ' . $user->data['user_id'] . ")
|
AND lr.user_id = ' . $user->data['user_id'] . ")
|
||||||
WHERE t.forum_id = $forum_id
|
WHERE t.forum_id = $forum_id
|
||||||
AND t.topic_approved = 1
|
AND t.topic_approved = 1
|
||||||
|
AND t.topic_type <> " . POST_ANNOUNCE . "
|
||||||
$limit_topics_time
|
$limit_topics_time
|
||||||
ORDER BY t.topic_type DESC, $sort_order_sql
|
ORDER BY t.topic_type DESC, $sort_order_sql
|
||||||
LIMIT $start, " . $config['topics_per_page'];
|
LIMIT $start, " . $config['topics_per_page'];
|
||||||
|
@ -328,7 +329,6 @@ if ($forum_data['forum_postable'])
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
// Okay, lets dump out the page ...
|
// Okay, lets dump out the page ...
|
||||||
if ($total_topics)
|
if ($total_topics)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue