diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-04 18:09:35 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-04 18:09:35 +0200 |
| commit | 8f027b68d64c1baa99b272d45f382c17310f1480 (patch) | |
| tree | 396e3a0db22b10060c42ad3cec8640e87a96c3c2 /phpBB/develop/create_schema_files.php | |
| parent | 4af503e11bc2c42654cf783f031bdb074fdd91ed (diff) | |
| parent | b672fc7ae113c0e01f1d7ce4ffae3eb26e57b586 (diff) | |
| download | forums-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/develop/create_schema_files.php')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 7a9bda32a0..0d239b11f2 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1794,8 +1794,7 @@ function get_schema_struct() 'user_inactive_time' => array('TIMESTAMP', 0), 'user_posts' => array('UINT', 0), 'user_lang' => array('VCHAR:30', ''), - 'user_timezone' => array('DECIMAL', 0), - 'user_dst' => array('BOOL', 0), + 'user_timezone' => array('VCHAR:100', 'UTC'), 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), 'user_style' => array('UINT', 0), 'user_rank' => array('UINT', 0), |