diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-23 12:56:34 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-23 12:56:34 +0000 |
| commit | b486710ea127ca055ac1cb117f056e837a32370f (patch) | |
| tree | 2b43cc026f1242dc1c4bc2caff372aaf5d45c81c /phpBB/includes/functions_display.php | |
| parent | aa9dbcec3c95efda6b3087c4bc6a48a0cef48774 (diff) | |
| download | forums-b486710ea127ca055ac1cb117f056e837a32370f.tar forums-b486710ea127ca055ac1cb117f056e837a32370f.tar.gz forums-b486710ea127ca055ac1cb117f056e837a32370f.tar.bz2 forums-b486710ea127ca055ac1cb117f056e837a32370f.tar.xz forums-b486710ea127ca055ac1cb117f056e837a32370f.zip | |
Merge in r8843, r8908, r8909
git-svn-id: file:///svn/phpbb/trunk@8910 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index ca97913887..7412bc1559 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -204,6 +204,12 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $subforums[$parent_id][$forum_id]['display'] = ($row['display_on_index']) ? true : false; $subforums[$parent_id][$forum_id]['name'] = $row['forum_name']; $subforums[$parent_id][$forum_id]['orig_forum_last_post_time'] = $row['forum_last_post_time']; + $subforums[$parent_id][$forum_id]['children'] = array(); + + if (isset($subforums[$parent_id][$row['parent_id']]) && !$row['display_on_index']) + { + $subforums[$parent_id][$row['parent_id']]['children'][] = $forum_id; + } $forum_rows[$parent_id]['forum_topics'] += $row['forum_topics']; @@ -303,6 +309,14 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod { $subforum_unread = (isset($forum_tracking_info[$subforum_id]) && $subforum_row['orig_forum_last_post_time'] > $forum_tracking_info[$subforum_id]) ? true : false; + if (!$subforum_unread && !empty($subforum_row['children'])) + { + foreach ($subforum_row['children'] as $child_id) + { + $subforum_unread = (isset($forum_tracking_info[$child_id]) && $subforums[$forum_id][$child_id]['orig_forum_last_post_time'] > $forum_tracking_info[$child_id]) ? true : false; + } + } + if ($subforum_row['display'] && $subforum_row['name']) { $subforums_list[] = array( |