diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-05 15:45:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-05 15:45:50 +0000 |
| commit | e593bcf3d7ff2636b9e0ea578cbd7b795e135a38 (patch) | |
| tree | 86e5fef9d7f2b7fd3f184c5dbdd6f8b8e521010c /phpBB/includes/functions_display.php | |
| parent | 76f9c1bdad31500ac0e87c7b8560352f39b0857a (diff) | |
| download | forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar.gz forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar.bz2 forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar.xz forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.zip | |
- re-enable polls (user is now able to decide if users are able to change votes if this feature is enabled within the given forum)
git-svn-id: file:///svn/phpbb/trunk@4981 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index bb820946d0..516f38aa6d 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -105,7 +105,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) { $active_forum_ary['forum_id'][] = $forum_id; $active_forum_ary['enable_icons'][] = $row['enable_icons']; - $active_forum_ary['forum_topics'] += $row['forum_topics']; + $active_forum_ary['forum_topics'] += ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics']; $active_forum_ary['forum_posts'] += $row['forum_posts']; } @@ -128,7 +128,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) $subforums[$parent_id]['name'][$forum_id] = $row['forum_name']; // Include subforum topic/post counts in parent counts - $forum_rows[$parent_id]['forum_topics'] += $row['forum_topics']; + $forum_rows[$parent_id]['forum_topics'] += ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics']; // Do not list redirects in LINK Forums as Posts. if ($row['forum_type'] != FORUM_LINK) @@ -313,7 +313,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) 'FORUM_NAME' => $row['forum_name'], 'FORUM_DESC' => $row['forum_desc'], $l_post_click_count => $post_click_count, - 'TOPICS' => $row['forum_topics'], + 'TOPICS' => ($auth->acl_get('m_approve', $row['forum_id'])) ? $row['forum_topics_real'] : $row['forum_topics'], 'LAST_POST_TIME' => $last_post_time, 'LAST_POSTER' => $last_poster, 'MODERATORS' => $moderators_list, |