diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-15 18:54:11 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-15 18:54:11 -0600 |
| commit | d59431691c27c73fba8ae9934b84b34a13280dd2 (patch) | |
| tree | 2d389fda2908ae58c975826cabd017de8014d810 /phpBB/install/convertors/convert_phpbb20.php | |
| parent | a2f6e494f37914352b0bb72d5a84904d3f2c51a3 (diff) | |
| parent | 460470229d972b93ef5a98b0d1d97a2a970d684f (diff) | |
| download | forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.gz forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.bz2 forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.xz forums-d59431691c27c73fba8ae9934b84b34a13280dd2.zip | |
Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11201:
[ticket/11201] Remove database column on update
[ticket/11201] Remove MSN/WLM fields
Diffstat (limited to 'phpBB/install/convertors/convert_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 5f30625980..6792f4ff9c 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -896,7 +896,6 @@ 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')), |