aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2002-10-11 02:24:00 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2002-10-11 02:24:00 +0000
commit1e52eafc800ab791010f77c1b4f39d9bdac69168 (patch)
tree4e67d7d51eb64047a466c5b37e814f46eaf87d43 /phpBB/includes/functions.php
parent58ddae0c90cbf8c751129c9d05432c376c8e374f (diff)
downloadforums-1e52eafc800ab791010f77c1b4f39d9bdac69168.tar
forums-1e52eafc800ab791010f77c1b4f39d9bdac69168.tar.gz
forums-1e52eafc800ab791010f77c1b4f39d9bdac69168.tar.bz2
forums-1e52eafc800ab791010f77c1b4f39d9bdac69168.tar.xz
forums-1e52eafc800ab791010f77c1b4f39d9bdac69168.zip
Minor bugfix (subforums template was called even if there only were empty subcats).
Jumpbox got its "Select a forum" entry back. git-svn-id: file:///svn/phpbb/trunk@2952 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php5
1 files changed, 2 insertions, 3 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)