1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 08:00:46 +01:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2017-06-16 20:18:50 +02:00
commit 7301748a3a
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 8 additions and 0 deletions

View File

@ -85,6 +85,7 @@
<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
<!-- EVENT acp_profile_contact_last -->
</dl>
</fieldset>

View File

@ -405,6 +405,13 @@ acp_profile_contact_before
* Since: 3.1.6-RC1
* Purpose: Add extra options to custom profile field configuration in the ACP
acp_profile_contact_last
===
* Locations:
+ adm/style/acp_profile.html
* Since: 3.1.11-RC1
* Purpose: Add contact specific options to custom profile fields in the ACP
acp_profile_step_one_lang_after
===
* Locations: