diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-11-07 21:45:34 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-11-07 21:45:34 +0000 |
| commit | 7366bd9e4100f5b4ecc0986b62e81a3b17b9dd01 (patch) | |
| tree | a2c69e5fefbc67196eaa88dfdc67f689bee0474f /phpBB/includes/functions_display.php | |
| parent | cfd055f9796e8b81013e00b89eb7c93a82963fc1 (diff) | |
| download | forums-7366bd9e4100f5b4ecc0986b62e81a3b17b9dd01.tar forums-7366bd9e4100f5b4ecc0986b62e81a3b17b9dd01.tar.gz forums-7366bd9e4100f5b4ecc0986b62e81a3b17b9dd01.tar.bz2 forums-7366bd9e4100f5b4ecc0986b62e81a3b17b9dd01.tar.xz forums-7366bd9e4100f5b4ecc0986b62e81a3b17b9dd01.zip | |
Fix a couple of issues, hopefully haven't broken anything Ashe was planning ...
git-svn-id: file:///svn/phpbb/trunk@3012 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 9a797c0e1d..df325baecf 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -52,7 +52,7 @@ function display_forums($root_data, $display_moderators=TRUE) continue; } - if (!$auth->acl_get('f_list', $row['forum_id'])) + if (!$auth->acl_gets('f_list', 'm_', 'a_', $row['forum_id'])) { // if the user does not have permissions to list this forum, skip everything until next branch @@ -105,7 +105,7 @@ function display_forums($root_data, $display_moderators=TRUE) if ($display_moderators) { - $forum_moderators = get_moderators($forum_moderators, $forum_ids); + get_moderators($forum_moderators, $forum_ids); } $root_id = $root_data['forum_id']; @@ -151,7 +151,7 @@ function display_forums($root_data, $display_moderators=TRUE) $folder_image = 'forum_locked'; $folder_alt = 'Forum_locked'; } - else + else { $folder_image = ($unread_topics) ? 'forum_new' : 'forum'; $folder_alt = ($unread_topics) ? 'New_posts' : 'No_new_posts'; @@ -170,17 +170,6 @@ function display_forums($root_data, $display_moderators=TRUE) $last_post = $user->lang['No_Posts']; } - if (!empty($forum_moderators[$forum_id])) - { - $l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] . ': ' : $user->lang['Moderators'] . ': ' ; - $moderators_list = implode(', ', $forum_moderators[$forum_id]); - } - else - { - $l_moderator = ' '; - $moderators_list = ' '; - } - if (isset($subforums[$forum_id])) { foreach ($subforums[$forum_id] as $subrow) @@ -192,7 +181,7 @@ function display_forums($root_data, $display_moderators=TRUE) $links = array(); foreach ($alist as $subforum_id => $subforum_name) { - $links[] = '<a href="viewforum.' . $phpEx . $SID . '&f=' . $subforum_id . '">' . htmlspecialchars($subforum_name) . '</a>'; + $links[] = '<a href="viewforum.' . $phpEx . $SID . '&f=' . $subforum_id . '">' . htmlspecialchars($subforum_name) . '</a>'; } $subforums_list = implode(', ', $links); @@ -210,7 +199,7 @@ function display_forums($root_data, $display_moderators=TRUE) if (!empty($forum_moderators[$forum_id])) { $l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] : $user->lang['Moderators']; - $moderators_list = implode(', ', $forum_moderators); + $moderators_list = implode(', ', $forum_moderators[$forum_id]); } } else |