diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-08 22:40:40 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-08 22:40:40 +0200 |
| commit | e41fcab3de8f3ac55e07b857a967923bc61ae4df (patch) | |
| tree | 84aa7ed14d6324a4e1e03e8e35f108295d2d8417 | |
| parent | 47b32f1da9edca7945bbc82ad65cdc30cb969890 (diff) | |
| parent | 8e80425c821d4ab2e3a40a0f2efb64b077563d3a (diff) | |
| download | forums-e41fcab3de8f3ac55e07b857a967923bc61ae4df.tar forums-e41fcab3de8f3ac55e07b857a967923bc61ae4df.tar.gz forums-e41fcab3de8f3ac55e07b857a967923bc61ae4df.tar.bz2 forums-e41fcab3de8f3ac55e07b857a967923bc61ae4df.tar.xz forums-e41fcab3de8f3ac55e07b857a967923bc61ae4df.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 2 | ||||
| -rw-r--r-- | phpBB/docs/events.md | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 756092a1f0..0d8b8ad583 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -343,6 +343,8 @@ <!-- EVENT acp_forums_rules_settings_append --> </fieldset> </div> + + <!-- EVENT acp_forums_custom_settings --> <fieldset class="submit-buttons"> <legend>{L_SUBMIT}</legend> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index b3d6602eeb..e349fe8e85 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -22,6 +22,12 @@ acp_email_options_after * Since: 3.1.2-RC1 * Purpose: Add settings to mass email form +acp_forums_custom_settings +=== +* Location: adm/style/acp_forums.html +* Since: 3.1.6-RC1 +* Purpose: Add its own box (fieldset) for extension settings + acp_forums_main_settings_append === * Location: adm/style/acp_forums.html |