From 479f95661ed18bcc375a8f3d883249d35caefec6 Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Thu, 5 Jan 2006 20:28:29 +0000 Subject: [PATCH] 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 --- phpBB/includes/session.php | 2 +- phpBB/includes/ucp/ucp_register.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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,