diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-02 13:30:29 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-02 13:30:29 +0100 |
| commit | 481d25d885bc2a037d27e80a26ebc17c52ffbdea (patch) | |
| tree | 629210f8fc1a64e66a49477bda2243da61dab43e /phpBB | |
| parent | cb8cd50495eb9d75cae8e7f1450033acfdb0b374 (diff) | |
| download | forums-481d25d885bc2a037d27e80a26ebc17c52ffbdea.tar forums-481d25d885bc2a037d27e80a26ebc17c52ffbdea.tar.gz forums-481d25d885bc2a037d27e80a26ebc17c52ffbdea.tar.bz2 forums-481d25d885bc2a037d27e80a26ebc17c52ffbdea.tar.xz forums-481d25d885bc2a037d27e80a26ebc17c52ffbdea.zip | |
[ticket/11031] Convert user notification options with default settings
PHPBB3-11031
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 13d2ed9bd4..de4e04a8e5 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -876,7 +876,8 @@ if (!$get_info) 'autoincrement' => 'user_id', 'query_first' => array( array('target', 'DELETE FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS), - array('target', $convert->truncate_statement . BOTS_TABLE) + array('target', $convert->truncate_statement . BOTS_TABLE), + array('target', $convert->truncate_statement . USER_NOTIFICATIONS_TABLE), ), 'execute_last' => ' @@ -949,6 +950,8 @@ if (!$get_info) array('user_sig_bbcode_bitfield', '', 'get_bbcode_bitfield'), array('', 'users.user_regdate AS post_time', ''), + array('', 'users.user_notify_pm', 'phpbb_add_notification_options'), + 'where' => 'users.user_id <> -1', ), ), |