diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:49:11 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:49:11 +0100 |
| commit | 0e35a8515598b6cdf38c2b98ecde9e8cc984e594 (patch) | |
| tree | c1250a6fc14fcd1eb7b539a3df8d66790d0bc460 /phpBB/install/convertors/convert_phpbb20.php | |
| parent | 4e144005f0ecca45601f2a90b066144f75c6f165 (diff) | |
| parent | 83a7e632b9b21fed88a3dbea679580d0740664f7 (diff) | |
| download | forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.gz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.bz2 forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.xz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html
Diffstat (limited to 'phpBB/install/convertors/convert_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 94f685fa2f..f3d1e969f1 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -906,12 +906,9 @@ if (!$get_info) array('user_inactive_reason', '', 'phpbb_inactive_reason'), array('user_inactive_time', '', 'phpbb_inactive_time'), - 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')), array('user_rank', 'users.user_rank', 'intval'), array('user_permissions', '', ''), @@ -963,6 +960,9 @@ if (!$get_info) array('pf_phpbb_occupation', 'users.user_occ', array('function1' => 'phpbb_set_encoding')), array('pf_phpbb_interests', 'users.user_interests', array('function1' => 'phpbb_set_encoding')), array('pf_phpbb_location', 'users.user_from', array('function1' => 'phpbb_set_encoding')), + array('pf_phpbb_icq', 'users.user_icq', array('function1' => 'phpbb_set_encoding')), + array('pf_phpbb_wlm', 'users.user_msnm', array('function1' => 'phpbb_set_encoding')), + array('pf_phpbb_website', 'users.user_website', 'validate_website'), 'where' => 'users.user_id <> -1', ), |