From 8ea409d1cc0096ceb07c1b18cda8c4ae771ef31f Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Sat, 14 Jan 2006 15:53:07 +0000 Subject: [PATCH] Fix the use of an invalid config option (Bug #861) Ordinarily this would have been quite low priority, but it had the potential to cause an error within the error handler, so I'm dealing with it now git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5454 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_users.php | 2 +- phpBB/includes/functions.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index 4c3a90bc36..d9c278e2ee 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -264,7 +264,7 @@ if ( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) $user_style = ( $HTTP_POST_VARS['style'] ) ? intval( $HTTP_POST_VARS['style'] ) : $board_config['default_style']; $user_lang = ( $HTTP_POST_VARS['language'] ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang']; $user_timezone = ( isset( $HTTP_POST_VARS['timezone']) ) ? doubleval( $HTTP_POST_VARS['timezone'] ) : $board_config['board_timezone']; - $user_template = ( $HTTP_POST_VARS['template'] ) ? $HTTP_POST_VARS['template'] : $board_config['board_template']; + $user_template = ( $HTTP_POST_VARS['template'] ) ? $HTTP_POST_VARS['template'] : $board_config['default_style']; $user_dateformat = ( $HTTP_POST_VARS['dateformat'] ) ? trim( $HTTP_POST_VARS['dateformat'] ) : $board_config['default_dateformat']; $user_avatar_local = ( isset( $HTTP_POST_VARS['avatarselect'] ) && !empty($HTTP_POST_VARS['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset( $HTTP_POST_VARS['avatarlocal'] ) ) ? $HTTP_POST_VARS['avatarlocal'] : '' ); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8c24488981..bea9c23afe 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -661,11 +661,7 @@ function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', } } - if ( empty($template) ) - { - $template = new Template($phpbb_root_path . 'templates/' . $board_config['board_template']); - } - if ( empty($theme) ) + if ( empty($template) || empty($theme) ) { $theme = setup_style($board_config['default_style']); }