diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-21 15:47:35 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-21 15:47:35 +0100 |
| commit | 9365d71b6b9cfd7e46e7b1872f56e5f4529ec363 (patch) | |
| tree | 4a23223c64d8637226287d989ce5bb213bfe31bb | |
| parent | 093989299404ac49a84dabe032e0de8eb94fa1c7 (diff) | |
| parent | 5f56804a9620bd537f85757707327a1017325053 (diff) | |
| download | forums-9365d71b6b9cfd7e46e7b1872f56e5f4529ec363.tar forums-9365d71b6b9cfd7e46e7b1872f56e5f4529ec363.tar.gz forums-9365d71b6b9cfd7e46e7b1872f56e5f4529ec363.tar.bz2 forums-9365d71b6b9cfd7e46e7b1872f56e5f4529ec363.tar.xz forums-9365d71b6b9cfd7e46e7b1872f56e5f4529ec363.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11277' into develop
* nickvergessen/ticket/11277:
[ticket/11277] Correctly remove user_dst column on database update
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 19d0d35fc0..1698e7777a 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2885,7 +2885,11 @@ function change_database_data(&$no_updates, $version) set_config('board_timezone', $update_helpers->convert_phpbb30_timezone($config['board_timezone'], $config['board_dst'])); // After we have calculated the timezones we can delete user_dst column from user table. - $db_tools->sql_column_remove(USERS_TABLE, 'user_dst'); + $statements = $db_tools->sql_column_remove(USERS_TABLE, 'user_dst'); + foreach ($statements as $sql) + { + _sql($sql, $errored, $error_ary); + } } if (!isset($config['site_home_url'])) |