makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 20:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix r9755 for #46765

Browse source 
Authorised by: ToonArmy

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9855 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ruslan Uzdenov 2009-07-26 10:16:52 +00:00
parent 801ac58bcf
commit ba37fa4f49
2 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/includes/functions.php
View file

@ -4150,7 +4150,8 @@ function get_unread_topics_list($user_id = false, $sql_extra = '')
{ {
// List of the tracked forums (not ideal, hope the better way will be found) // List of the tracked forums (not ideal, hope the better way will be found)
// This list is to fetch later the forums user never read (fully) before // This list is to fetch later the forums user never read (fully) before
$sql = 'SELECT forum_id FROM ' . FORUMS_TRACK_TABLE . " $sql = 'SELECT forum_id
FROM ' . FORUMS_TRACK_TABLE . "
WHERE user_id = {$user_id}"; WHERE user_id = {$user_id}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -4160,11 +4161,13 @@ function get_unread_topics_list($user_id = false, $sql_extra = '')
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Get list of the unread topics - on topics tracking as the first step // Get list of the unread topics - on topics tracking as the first step
$sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt $sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time
FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
WHERE t.topic_id = tt.topic_id WHERE t.topic_id = tt.topic_id
AND t.topic_last_post_time >= tt.mark_time AND t.topic_last_post_time >= tt.mark_time
AND tt.user_id = {$user_id} AND tt.user_id = {$user_id}
$sql_extra"; $sql_extra
ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -4185,12 +4188,14 @@ function get_unread_topics_list($user_id = false, $sql_extra = '')
// Get list of the unread topics - on forums tracking as the second step // Get list of the unread topics - on forums tracking as the second step
// We don't take in account topics tracked before // We don't take in account topics tracked before
$sql = 'SELECT t.topic_id, ft.mark_time FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft $sql = 'SELECT t.topic_id, ft.mark_time
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
WHERE t.forum_id = ft.forum_id WHERE t.forum_id = ft.forum_id
AND t.topic_last_post_time > ft.mark_time AND t.topic_last_post_time > ft.mark_time
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . " AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
AND ft.user_id = {$user_id} AND ft.user_id = {$user_id}
$sql_extra"; $sql_extra
ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -4198,12 +4203,18 @@ function get_unread_topics_list($user_id = false, $sql_extra = '')
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Refresh the full list of the tracked topics
unset($tracked_topics_list);
$tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
// And the last step - find unread topics were not found before (that can mean a user has never read some forums) // And the last step - find unread topics were not found before (that can mean a user has never read some forums)
$sql = 'SELECT topic_id FROM ' . TOPICS_TABLE . " $sql = 'SELECT topic_id
FROM ' . TOPICS_TABLE . "
WHERE topic_last_post_time > {$user->data['user_lastmark']} WHERE topic_last_post_time > {$user->data['user_lastmark']}
AND " . $db->sql_in_set('topic_id', array_keys($unread_topics_list), true, true) . ' AND " . $db->sql_in_set('topic_id', array_keys($unread_topics_list), true, true) . '
AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . " AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
$sql_extra"; $sql_extra
ORDER BY topic_last_post_time DESC";
$result = $db->sql_query_limit($sql, 1000); $result = $db->sql_query_limit($sql, 1000);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {