From ba536c6270a1cd448e5a4add56686fd3fdc9d711 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 6 Apr 2007 14:03:20 +0000 Subject: some fixes git-svn-id: file:///svn/phpbb/trunk@7286 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_display.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'phpBB/includes/functions_display.php') diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 1ab6dda638..23e2cd4106 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -287,24 +287,26 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod { foreach ($subforums[$forum_id] as $subforum_id => $subforum_row) { - // Update unread information if needed - if (!$forum_unread) - { - $forum_unread = (isset($forum_tracking_info[$subforum_id]) && $subforum_row['orig_forum_last_post_time'] > $forum_tracking_info[$subforum_id]) ? true : false; - } + $subforum_unread = (isset($forum_tracking_info[$subforum_id]) && $subforum_row['orig_forum_last_post_time'] > $forum_tracking_info[$subforum_id]) ? true : false; if ($subforum_row['display'] && $subforum_row['name']) { $subforums_list[] = array( 'link' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $subforum_id), 'name' => $subforum_row['name'], - 'unread' => $forum_unread, + 'unread' => $subforum_unread, ); } else { unset($subforums[$forum_id][$subforum_id]); } + + // If one subforum is unread the forum gets unread too... + if ($subforum_unread) + { + $forum_unread = true; + } } $l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': '; -- cgit v1.2.1