diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 5 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index c4e10c1bef..22a6dee881 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -186,7 +186,7 @@ function make_jumpbox($action, $forum_id = false) { global $auth, $template, $lang, $db, $nav_links, $phpEx; - $boxstring = '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }">'; + $boxstring = '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>'; $sql = 'SELECT forum_id, forum_name, forum_status, left_id, right_id FROM ' . FORUMS_TABLE . ' @@ -209,7 +209,7 @@ function make_jumpbox($action, $forum_id = false) $right = $row['right_id']; - $linefeed = FALSE; + $linefeed = TRUE; if ( ( $auth->acl_get('f_list', $forum_id) || $auth->acl_get('a_') )) { if ($row['forum_status'] == ITEM_CATEGORY) @@ -256,7 +256,6 @@ function make_jumpbox($action, $forum_id = false) $template->assign_vars(array( 'L_GO' => $lang['Go'], 'L_JUMP_TO' => $lang['Jump_to'], - 'L_SELECT_FORUM' => $lang['Select_forum'], 'S_JUMPBOX_SELECT' => $boxstring, 'S_JUMPBOX_ACTION' => $action) diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 1af8946319..e20168e731 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -96,6 +96,7 @@ if (!$auth->acl_get('f_read', $forum_id)) $type = 'parent'; $forum_rows = array(); +$s_has_subforums = FALSE; foreach ($forum_branch as $row) { if ($type == 'parent') @@ -133,12 +134,21 @@ foreach ($forum_branch as $row) { $branch_root_id = $row['forum_id']; } + else + { + $s_has_subforums = TRUE; + } } elseif ($row['parent_id'] == $branch_root_id) { // Forum directly under a category $forum_rows[] = $row; $parent_id = $row['forum_id']; + + if ($row['forum_status'] != ITEM_CATEGORY) + { + $s_has_subforums = TRUE; + } } elseif ($row['forum_status'] != ITEM_CATEGORY) { @@ -337,7 +347,7 @@ $template->assign_vars(array( // // Do we have subforums? if so, let's include this harmless file // -if (count($forum_rows)) +if ($s_has_subforums) { $template->assign_vars(array( 'S_HAS_SUBFORUM' => TRUE, |