From c677640b64e5c3fe8406e47f7eeef2f18c5edf71 Mon Sep 17 00:00:00 2001 From: Ludovic Arnaud Date: Thu, 10 Oct 2002 00:35:35 +0000 Subject: Bugfix (disappearing forum names) + enabled jumpbox and modified it to allow category jumping. git-svn-id: file:///svn/phpbb/trunk@2950 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 73 +++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 18 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index dda7a3c393..c4e10c1bef 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -187,40 +187,72 @@ function make_jumpbox($action, $forum_id = false) global $auth, $template, $lang, $db, $nav_links, $phpEx; $boxstring = ''; + $template->assign_vars(array( 'L_GO' => $lang['Go'], 'L_JUMP_TO' => $lang['Jump_to'], @@ -555,7 +587,10 @@ function obtain_word_list(&$orig_word, &$replacement_word) function redirect($location) { global $db; - $db->sql_close(); + if (isset($db)) + { + $db->sql_close(); + } $header_location = (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE'))) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . $location); @@ -633,9 +668,10 @@ function message_die($msg_code, $msg_text = '', $msg_title = '') break; case ERROR: + $db->sql_close(); + echo 'phpBB 2 :: General Error' . "\n"; echo '

phpBB2 :: General Error

' . $msg_text . '

Contact the site administrator to report this failure

'; - $db->sql_close(); break; } @@ -658,9 +694,10 @@ function msg_handler($errno, $msg_text, $errfile, $errline) case E_ERROR: case E_USER_ERROR: + $db->sql_close(); + echo 'phpBB 2 :: General Error' . "\n"; echo '

phpBB2 :: General Error

' . $msg_text . '

Contact the site administrator to report this failure

'; - $db->sql_close(); break; case E_USER_NOTICE: -- cgit v1.2.1