aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/schemas/firebird_schema.sql
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-06-04 18:09:35 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-06-04 18:09:35 +0200
commit8f027b68d64c1baa99b272d45f382c17310f1480 (patch)
tree396e3a0db22b10060c42ad3cec8640e87a96c3c2 /phpBB/install/schemas/firebird_schema.sql
parent4af503e11bc2c42654cf783f031bdb074fdd91ed (diff)
parentb672fc7ae113c0e01f1d7ce4ffae3eb26e57b586 (diff)
downloadforums-8f027b68d64c1baa99b272d45f382c17310f1480.tar
forums-8f027b68d64c1baa99b272d45f382c17310f1480.tar.gz
forums-8f027b68d64c1baa99b272d45f382c17310f1480.tar.bz2
forums-8f027b68d64c1baa99b272d45f382c17310f1480.tar.xz
forums-8f027b68d64c1baa99b272d45f382c17310f1480.zip
Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
Diffstat (limited to 'phpBB/install/schemas/firebird_schema.sql')
-rw-r--r--phpBB/install/schemas/firebird_schema.sql3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 51565ef2d4..155ac2a2d4 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1242,8 +1242,7 @@ CREATE TABLE phpbb_users (
user_inactive_time INTEGER DEFAULT 0 NOT NULL,
user_posts INTEGER DEFAULT 0 NOT NULL,
user_lang VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL,
- user_timezone DOUBLE PRECISION DEFAULT 0 NOT NULL,
- user_dst INTEGER DEFAULT 0 NOT NULL,
+ user_timezone VARCHAR(100) CHARACTER SET NONE DEFAULT 'UTC' NOT NULL,
user_dateformat VARCHAR(30) CHARACTER SET UTF8 DEFAULT 'd M Y H:i' NOT NULL COLLATE UNICODE,
user_style INTEGER DEFAULT 0 NOT NULL,
user_rank INTEGER DEFAULT 0 NOT NULL,