diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 20:57:37 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 20:57:37 -0600 |
| commit | 1e5a1b72dca4e0ccae9340467225499649dea6c8 (patch) | |
| tree | 6f16d15999e6ac5f158643619213acbf2a7daf7c /phpBB/install/convertors/convert_phpbb20.php | |
| parent | 34c564062a95b9306487fbc6bbd17c7c9c8a63c4 (diff) | |
| parent | 336187151a2010197ddda1bcdabc311fd10c1c87 (diff) | |
| download | forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.gz forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.bz2 forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.xz forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.zip | |
Merge remote-tracking branch 'remotes/bantu/ticket/11201' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11201:
[ticket/11201] Revert WLM dropping because it is still used in China.
Diffstat (limited to 'phpBB/install/convertors/convert_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 6792f4ff9c..5f30625980 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -896,6 +896,7 @@ if (!$get_info) array('user_occ', 'users.user_occ', array('function1' => 'phpbb_set_encoding')), array('user_website', 'users.user_website', 'validate_website'), array('user_jabber', '', ''), + array('user_msnm', 'users.user_msnm', array('function1' => 'phpbb_set_encoding')), array('user_yim', 'users.user_yim', array('function1' => 'phpbb_set_encoding')), array('user_aim', 'users.user_aim', array('function1' => 'phpbb_set_encoding')), array('user_icq', 'users.user_icq', array('function1' => 'phpbb_set_encoding')), |