From c27b7e010b063c7bd5aca3e25810797965e941ff Mon Sep 17 00:00:00 2001 From: dougk_ff7 Date: Fri, 29 Nov 2002 06:58:37 +0000 Subject: [PATCH] Ok, these are just fixes for a few bugs I saw while digging around all of the different pages. Everything else looks fine. I dunno if I interrupted something, but admin_board's call to lang_select() and style_select() is inconsistant. lang_select() requires the directory be passed *without* $phpbb_root_dir tacked on, it will add it later. style_select(), however requires that the root directory be added before calling the function. Wierd... git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3152 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_board.php | 2 +- phpBB/includes/prune.php | 4 ++-- phpBB/login.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index d63ec569ef..9983d51483 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -68,7 +68,7 @@ else } $style_select = style_select($new['default_style'], 'default_style', "../templates"); -$lang_select = language_select($new['default_lang'], 'default_lang', "../language"); +$lang_select = language_select($new['default_lang'], 'default_lang', "language"); $timezone_select = tz_select($new['board_timezone'], 'board_timezone'); $disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : ""; diff --git a/phpBB/includes/prune.php b/phpBB/includes/prune.php index ae4d8ae002..964c662f06 100644 --- a/phpBB/includes/prune.php +++ b/phpBB/includes/prune.php @@ -27,7 +27,7 @@ if ( !defined('IN_PHPBB') ) require($phpbb_root_path . 'includes/functions_search.'.$phpEx); -function prune($forum_id, $prune_date, $prune_all = false;) +function prune($forum_id, $prune_date, $prune_all = false) { global $db, $lang; @@ -163,4 +163,4 @@ function auto_prune($forum_id = 0) return; } -?> \ No newline at end of file +?> diff --git a/phpBB/login.php b/phpBB/login.php index 2aee65ffc2..f824511520 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -133,7 +133,7 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($ if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) { - $redirect = (!empty($HTTP_POST_VARS['redirect'])) ? $HTTP_POST_VARS['redirect'] : $HTTP_GET_VARS['redirect'] + $redirect = (!empty($HTTP_POST_VARS['redirect'])) ? $HTTP_POST_VARS['redirect'] : $HTTP_GET_VARS['redirect']; header($header_location . append_sid($redirect, true)); exit; } @@ -237,4 +237,4 @@ else } -?> \ No newline at end of file +?>