diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:43:39 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:43:39 +0100 |
| commit | b7597a347b2acbbcd49ca63aaf334c4d79e2ba25 (patch) | |
| tree | 7b99877a36ab8841c89130ec535dbcf21206eacb /phpBB | |
| parent | 809d73ca5eae048801d0aff7b0214d11edf90fc1 (diff) | |
| parent | 8eda17f430a797b98b7448290d05910a9bbf580e (diff) | |
| download | forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar.gz forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar.bz2 forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar.xz forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14887] ACP profile step one lang specific event
Diffstat (limited to 'phpBB')
| -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 07718846cc..cebd2e9632 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -127,6 +127,7 @@ <!-- ENDIF --> </dl> <!-- ENDIF --> + <!-- EVENT acp_profile_step_one_lang_after --> </fieldset> <fieldset class="quick"> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 619ba06c5f..75a773e906 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -381,6 +381,13 @@ acp_profile_contact_before * Since: 3.1.6-RC1 * Purpose: Add extra options to custom profile field configuration in the ACP +acp_profile_step_one_lang_after +=== +* Locations: + + adm/style/acp_profile.html +* Since: 3.1.11-RC1 +* Purpose: Add extra lang specific options to custom profile field step one configuration in the ACP + acp_prune_forums_append === * Locations: |