diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:37:51 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:37:51 +0200 |
| commit | b9890c6a4c7c30215ce7863825917f9152326081 (patch) | |
| tree | e7b03ee965ceecfe2bb61f3b07997059f448cb7f /phpBB/install/schemas/schema_data.sql | |
| parent | 8595fee0401c66511d508fd2d2f0a69609ce5770 (diff) | |
| parent | cdfcbfc6d0c7c1ea7f1b5c802eaa85887934f829 (diff) | |
| download | forums-b9890c6a4c7c30215ce7863825917f9152326081.tar forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.gz forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.bz2 forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.xz forums-b9890c6a4c7c30215ce7863825917f9152326081.zip | |
Merge pull request #2612 from Dragooon/ticket/12733
[ticket/12733] Add Twitter custom profile field
* Dragooon/ticket/12733:
[ticket/12733] Add functional test for twitter profile field
[ticket/12733] Values needn't be escaped for schema_data.sql
[ticket/12733] Set field_active to 1 for Twitter
[ticket/12733] Convert spaces to tabs
[ticket/12733] Fix spacing for block header in profilefield_twitter.php
[ticket/12733] Update schema.json
[ticket/12733] Add Twitter custom profile field
Conflicts:
phpBB/install/schemas/schema.json
phpBB/install/schemas/schema_data.sql
phpBB/language/en/memberlist.php
tests/functional/ucp_profile_test.php
Diffstat (limited to 'phpBB/install/schemas/schema_data.sql')
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7ed2ec76fa..1888e79cf7 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -807,6 +807,7 @@ INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_len INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_wlm', 'profilefields.type.string', 'phpbb_wlm', '40', '5', '255', '', '', '.*', 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 7, 1, '', ''); INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_yahoo', 'profilefields.type.string', 'phpbb_yahoo', '40', '5', '255', '', '', '.*', 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 8, 1, 'SEND_YIM_MESSAGE', 'http://edit.yahoo.com/config/send_webmesg?.target=%s&.src=pg'); INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_facebook', 'profilefields.type.string', 'phpbb_facebook', '20', '5', '50', '', '', '[\w.]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 9, 1, 'VIEW_FACEBOOK_PROFILE', 'http://facebook.com/%s/'); +INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_twitter', 'profilefields.type.string', 'phpbb_twitter', '20', '1', '15', '', '', '[\w_]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 10, 1, 'VIEW_TWITTER_PROFILE', 'http://twitter.com/%s'); # User Notification Options (for first user) INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, ''); |