diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 19:40:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 19:40:56 +0200 |
| commit | 7afc13b4db3a1444c5464f4f4f05a72cabede964 (patch) | |
| tree | e4ffd41c5232a5afe80ec74af8278b9b6cce7916 /phpBB/install | |
| parent | afe9d3c3f39ca1c69146778882f2b0250dfa3ed7 (diff) | |
| parent | d4679e6a95b45d839f854493682ebe64651260da (diff) | |
| download | forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar.gz forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar.bz2 forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar.xz forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.zip | |
Merge pull request #2615 from Dragooon/ticket/12730
[ticket/12730] Add Google+ profile field
* Dragooon/ticket/12730:
[ticket/12730] Update Google+ button class to use proper identification
[ticket/12730] Update maxlen for type_googleplus to 255
[ticket/12730] Fix type_googleplus_test to use same validation rule as the field
[ticket/12730] Update field_length to be 20 by default for Google+
[ticket/12730] Google+ field_order should be 13
[ticket/12730] Switch service name to googleplus for type_googleplus
[ticket/12730] Restore field_length to 10 for type_googleplus
[ticket/12730] Add functional test for Google+ field
[ticket/12730] Value shouldn't be escaped for schema_data.sql
[ticket/12730] Missing newline at type_googleplus_test.php
[ticket/12730] Set field_active to 1 for Google+ field
[ticket/12730] Add unit test for type_googleplus
[ticket/12730] Add missing brackets to type_googleplus.php
[ticket/12730] Update field_order for Google+ CPF
[ticket/12730] Use string template for Google+ CPF instead of a new one
[ticket/12730] Minor formatting fixes
[ticket/12730] Incorrect indentation for type_googleplus
[ticket/12730] Spaces in block header
[ticket/12730] Add a Google+ field by default
[ticket/12730] Add Google+ profile field type
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/schemas/schema.json | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json index c6974aab21..a3ffd923a1 100644 --- a/phpBB/install/schemas/schema.json +++ b/phpBB/install/schemas/schema.json @@ -2104,6 +2104,10 @@ "VCHAR", "" ], + "pf_phpbb_googleplus": [ + "VCHAR", + "" + ], "pf_phpbb_interests": [ "MTEXT", "" diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 1087ba1851..9b9b7f77f1 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -810,6 +810,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_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'); 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_skype', 'profilefields.type.string', 'phpbb_skype', '20', '6', '32', '', '', '[a-zA-Z][\w\.,\-_]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 11, 1, 'VIEW_SKYPE_PROFILE', 'skype:%s?userinfo'); 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_youtube', 'profilefields.type.string', 'phpbb_youtube', '20', '3', '60', '', '', '[a-zA-Z][\w\.,\-_]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 12, 1, 'VIEW_YOUTUBE_CHANNEL', 'http://youtube.com/user/%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_googleplus', 'profilefields.type.googleplus', 'phpbb_googleplus', '20', '3', '255', '', '', '[\w]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 13, 1, 'VIEW_GOOGLEPLUS_PROFILE', 'http://plus.google.com/%s'); # User Notification Options (for first user) INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, ''); |