From ff8040ab069595b42c692fa409130069e499c80c Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Mon, 11 Jun 2001 12:53:35 +0000 Subject: Fixed isset and empty checks on userdata so user prefs now work again git-svn-id: file:///svn/phpbb/trunk@468 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7fbbcb40bb..bfff4b7461 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -201,27 +201,29 @@ function init_userprefs($userdata) { $theme = setuptheme($board_config['override_user_themes']); } - if(!empty($userdata['user_lang'])) - { - $board_config['default_lang'] = $userdata['user_lang']; - } - if(!empty($userdata['user_dateformat'])) - { - $board_config['default_dateformat'] = $userdata['user_dateformat']; - } - if(isset($userdata['user_timezone'])) + + if($userdata['user_id'] != ANONYMOUS || $userdata['user_id'] != DELETED) { - $board_config['default_timezone'] = $userdata['user_timezone']; + if(!empty($userdata['user_lang'])) + { + $board_config['default_lang'] = $userdata['user_lang']; + } + if(!empty($userdata['user_dateformat'])) + { + $board_config['default_dateformat'] = $userdata['user_dateformat']; + } + if(isset($userdata['user_timezone'])) + { + $board_config['default_timezone'] = $userdata['user_timezone']; + } + if(!empty($userdata['user_template'])) + { + $board_config['default_template'] = $userdata['user_template']; + } } + // Setup user's Template - if(!empty($userdata['user_template'])) - { - $template = new Template("templates/".$userdata['user_template']); - } - else - { - $template = new Template("templates/".$board_config['default_template']); - } + $template = new Template("templates/" . $board_config['default_template']); // // This is currently worthless since all the individual -- cgit v1.2.1