From 7cfaf4944d96d5665e56151065431c2b63634889 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Fri, 4 Jun 2010 09:14:50 +0200 Subject: [PATCH] If the user did not explicitly chose its skin, it has to be null. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- modules/admin.php | 2 +- upgrade/account/00_account.sql | 2 +- upgrade/account/99_insertion.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/admin.php b/modules/admin.php index 3aa7a7c..891602a 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -436,7 +436,7 @@ class AdminModule extends PLModule if (Post::i('skin') != $user->skin) { $to_update['skin'] = Post::i('skin'); if ($to_update['skin'] == 0) { - $to_update['skin'] = 1; + $to_update['skin'] = null; } } if (Post::s('state') != $user->state) { diff --git a/upgrade/account/00_account.sql b/upgrade/account/00_account.sql index 65e4608..cc73aea 100644 --- a/upgrade/account/00_account.sql +++ b/upgrade/account/00_account.sql @@ -25,7 +25,7 @@ CREATE TABLE accounts ( display_name varchar(255) default null, sex enum('female', 'male') not null default 'male', email_format enum('text', 'html') not null default 'html', - skin tinyint(1) unsigned not null default 1, + skin tinyint(1) unsigned default null, last_version varchar(16) not null, primary key uid (uid), diff --git a/upgrade/account/99_insertion.sql b/upgrade/account/99_insertion.sql index d8b920b..b78cb18 100644 --- a/upgrade/account/99_insertion.sql +++ b/upgrade/account/99_insertion.sql @@ -20,7 +20,7 @@ insert into accounts prenom AS display_name, IF(FIND_IN_SET('femme', flags), 'female', 'male') AS sex, IF(q.core_mail_fmt = 'html', 'html', 'text') AS email_format, - IF(q.skin IS NULL OR q.skin = 0, 1, q.skin) AS skin, + IF(q.skin = 0, NULL, q.skin) AS skin, q.last_version AS last_version from #x4dat#.auth_user_md5 as u left join #x4dat#.auth_user_quick as q on (q.user_id = u.user_id) -- 2.1.4