diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-03-21 23:10:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-03-21 23:10:11 +0000 |
| commit | e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c (patch) | |
| tree | 8b687905d08d6af99c3396fa5c0470c7bbef4ccb /phpBB/includes/functions_display.php | |
| parent | a4e51c9699c7a09bea32ad832a9818abba008801 (diff) | |
| download | forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.gz forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.bz2 forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.xz forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.zip | |
- and my second attempt
git-svn-id: file:///svn/phpbb/trunk@5109 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index d1e7ebb325..e9cc61b5a6 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -98,7 +98,9 @@ function display_forums($root_data = '', $display_moderators = TRUE) $right_id = $row['right_id']; continue; } - + + + // Display active topics from this forum? if ($show_active && $row['forum_type'] == FORUM_POST && $auth->acl_get('f_read', $forum_id) && ($row['forum_flags'] & 16)) { @@ -213,6 +215,8 @@ function display_forums($root_data = '', $display_moderators = TRUE) $visible_forums++; $forum_id = $row['forum_id']; + $subforums_list = $l_subforums = ''; + // Generate list of subforums if we need to if (isset($subforums[$forum_id])) { @@ -254,9 +258,6 @@ function display_forums($root_data = '', $display_moderators = TRUE) $folder_image = 'forum_link'; break; } - - $subforums_list = ''; - $l_subforums = ''; } // Which folder should we display? @@ -535,8 +536,8 @@ function display_attachments($forum_id, $blockname, &$attachment_data, &$update_ { // Some basics... $attachment['extension'] = strtolower(trim($attachment['extension'])); - $filename = $phpbb_root_path . $config['upload_dir'] . '/' . basename($attachment['physical_filename']); - $thumbnail_filename = $phpbb_root_path . $config['upload_dir'] . '/thumb_' . basename($attachment['physical_filename']); + $filename = $phpbb_root_path . $config['upload_path'] . '/' . basename($attachment['physical_filename']); + $thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . basename($attachment['physical_filename']); $upload_image = ''; |