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/includes/db/schema_data.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/includes/db/schema_data.php')
| -rw-r--r-- | phpBB/includes/db/schema_data.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php index 0447895433..04a4ce0d9c 100644 --- a/phpBB/includes/db/schema_data.php +++ b/phpBB/includes/db/schema_data.php @@ -777,6 +777,9 @@ $schema_data['phpbb_profile_fields'] = array( 'field_no_view' => array('BOOL', 0), 'field_active' => array('BOOL', 0), 'field_order' => array('UINT', 0), + 'field_is_contact' => array('BOOL', 0), + 'field_contact_desc' => array('VCHAR', ''), + 'field_contact_url' => array('VCHAR', ''), ), 'PRIMARY_KEY' => 'field_id', 'KEYS' => array( @@ -791,6 +794,9 @@ $schema_data['phpbb_profile_fields_data'] = array( 'pf_phpbb_location' => array('VCHAR', ''), 'pf_phpbb_interests' => array('TEXT_UNI', ''), 'pf_phpbb_occupation' => array('TEXT_UNI', ''), + 'pf_phpbb_icq' => array('VCHAR', ''), + 'pf_phpbb_wlm' => array('VCHAR', ''), + 'pf_phpbb_website' => array('VCHAR', ''), ), 'PRIMARY_KEY' => 'user_id', ); @@ -1169,12 +1175,9 @@ $schema_data['phpbb_users'] = array( 'user_sig' => array('MTEXT_UNI', ''), 'user_sig_bbcode_uid' => array('VCHAR:8', ''), 'user_sig_bbcode_bitfield' => array('VCHAR:255', ''), - 'user_icq' => array('VCHAR:15', ''), 'user_aim' => array('VCHAR_UNI', ''), 'user_yim' => array('VCHAR_UNI', ''), - 'user_msnm' => array('VCHAR_UNI', ''), 'user_jabber' => array('VCHAR_UNI', ''), - 'user_website' => array('VCHAR_UNI:200', ''), 'user_form_salt' => array('VCHAR_UNI:32', ''), 'user_new' => array('BOOL', 1), 'user_reminded' => array('TINT:4', 0), |