diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-16 20:18:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-16 20:18:50 +0200 |
| commit | 7301748a3a1040ebe75243fc61350451aaabc8a5 (patch) | |
| tree | a2859d01b9ec8e102eccbe8c754af61dcdce03ee | |
| parent | c555bd78dfa4465aa2e51552dce608b0691c6a75 (diff) | |
| parent | 1c4f49249ffe8457914372b08b15056ad5d38085 (diff) | |
| download | forums-7301748a3a1040ebe75243fc61350451aaabc8a5.tar forums-7301748a3a1040ebe75243fc61350451aaabc8a5.tar.gz forums-7301748a3a1040ebe75243fc61350451aaabc8a5.tar.bz2 forums-7301748a3a1040ebe75243fc61350451aaabc8a5.tar.xz forums-7301748a3a1040ebe75243fc61350451aaabc8a5.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/adm/style/acp_profile.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/events.md | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index cebd2e9632..bd3935b464 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -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> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index ef40e5f434..8bece6465e 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -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: |