diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-03-29 18:28:45 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-03-29 18:28:45 +0000 |
| commit | ec884a2c5b3a9e786fdc5ef3988fab1b5cdb9e8c (patch) | |
| tree | 704f813298e65534921692681edb48603af83d59 /phpBB/includes/functions_display.php | |
| parent | 9e38434b4a2d487b1d490b5eac5d29750f37656a (diff) | |
| download | forums-ec884a2c5b3a9e786fdc5ef3988fab1b5cdb9e8c.tar forums-ec884a2c5b3a9e786fdc5ef3988fab1b5cdb9e8c.tar.gz forums-ec884a2c5b3a9e786fdc5ef3988fab1b5cdb9e8c.tar.bz2 forums-ec884a2c5b3a9e786fdc5ef3988fab1b5cdb9e8c.tar.xz forums-ec884a2c5b3a9e786fdc5ef3988fab1b5cdb9e8c.zip | |
icon name change
git-svn-id: file:///svn/phpbb/trunk@3747 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 448ff87583..debc51f9f8 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -52,11 +52,11 @@ function display_forums($root_data = '', $display_moderators = TRUE) $lastread_sql = ''; // } - $sql = 'SELECT f.* ' . $lastread_select . ' - FROM ' . FORUMS_TABLE . " f " . - $lastread_sql . - $where_sql . ' - ORDER BY left_id'; + $sql = "SELECT f.* $lastread_select + FROM " . FORUMS_TABLE . " f + $lastread_sql + $where_sql + ORDER BY left_id"; $result = $db->sql_query($sql); $branch_root_id = $root_data['forum_id']; @@ -73,13 +73,14 @@ function display_forums($root_data = '', $display_moderators = TRUE) } unset($right_id); } + if (!$row['forum_postable'] && ($row['left_id'] + 1 == $row['right_id'])) { // Non-postable forum with no subforums: don't display continue; } - if (!$auth->acl_gets('f_list', 'm_', 'a_', intval($row['forum_id']))) + if (!$auth->acl_get('f_list', $row['forum_id'])) { // if the user does not have permissions to list this forum, skip everything until next branch @@ -178,7 +179,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) $last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : "<a href=\"memberlist.$phpEx$SID&mode=viewprofile&u=" . $row['forum_last_poster_id'] . '">' . $row['forum_last_poster_name'] . '</a> '; - $last_post .= '<a href="viewtopic.' . $phpEx . $SID . '&f=' . $row['forum_id'] . '&p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'] . '">' . $user->img('goto_post_latest', 'VIEW_LATEST_POST') . '</a>'; + $last_post .= '<a href="viewtopic.' . $phpEx . $SID . '&f=' . $row['forum_id'] . '&p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'] . '">' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . '</a>'; } else { |