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
This commit is contained in:
dougk_ff7 2002-11-29 06:58:37 +00:00
parent d37ab45ff3
commit c27b7e010b
3 changed files with 5 additions and 5 deletions

View file

@ -68,7 +68,7 @@ else
} }
$style_select = style_select($new['default_style'], 'default_style', "../templates"); $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'); $timezone_select = tz_select($new['board_timezone'], 'board_timezone');
$disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : ""; $disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : "";

View file

@ -27,7 +27,7 @@ if ( !defined('IN_PHPBB') )
require($phpbb_root_path . 'includes/functions_search.'.$phpEx); 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; global $db, $lang;

View file

@ -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'])) 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)); header($header_location . append_sid($redirect, true));
exit; exit;
} }