aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-06-11 12:53:35 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-06-11 12:53:35 +0000
commitff8040ab069595b42c692fa409130069e499c80c (patch)
tree9fe03685f98cd1cf28308b9bfc2ba0323fde1015 /phpBB
parent36da30d2216bc6a2cf4f995cf34273d6764509d3 (diff)
downloadforums-ff8040ab069595b42c692fa409130069e499c80c.tar
forums-ff8040ab069595b42c692fa409130069e499c80c.tar.gz
forums-ff8040ab069595b42c692fa409130069e499c80c.tar.bz2
forums-ff8040ab069595b42c692fa409130069e499c80c.tar.xz
forums-ff8040ab069595b42c692fa409130069e499c80c.zip
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
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions.php38
1 files changed, 20 insertions, 18 deletions
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