diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-01-05 20:28:29 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-01-05 20:28:29 +0000 |
| commit | 479f95661ed18bcc375a8f3d883249d35caefec6 (patch) | |
| tree | 16960ca11b2bee12ef0a51b8219e7f873deda47a /phpBB | |
| parent | 717424444680049eb0e2956486bcc149fe5cd851 (diff) | |
| download | forums-479f95661ed18bcc375a8f3d883249d35caefec6.tar forums-479f95661ed18bcc375a8f3d883249d35caefec6.tar.gz forums-479f95661ed18bcc375a8f3d883249d35caefec6.tar.bz2 forums-479f95661ed18bcc375a8f3d883249d35caefec6.tar.xz forums-479f95661ed18bcc375a8f3d883249d35caefec6.zip | |
Fix 2 minor errors:
1. Set user_style on registration to the board default
2. Do not try to use the template when throwing an error about a missing style
git-svn-id: file:///svn/phpbb/trunk@5426 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/session.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index b3315ec4bc..a1086cb3bd 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -786,7 +786,7 @@ class user extends session if (!$this->theme) { - trigger_error('Could not get style data'); + trigger_error('Could not get style data', E_USER_ERROR); } // Now parse the cfg file and cache it diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index a010f1575c..918774c1b2 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -240,6 +240,7 @@ class ucp_register 'group_id' => (int) $group_id, 'user_timezone' => (float) $tz, 'user_lang' => $lang, + 'user_style' => $config['default_style'], 'user_allow_pm' => 1, 'user_type' => $user_type, 'user_actkey' => $user_actkey, |