mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 22:51:23 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-08-08 22:40:40 +02:00
parent 47b32f1da9 8e80425c82
commit e41fcab3de
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/acp_forums.html
View File

@@ -343,6 +343,8 @@
<!-- EVENT acp_forums_rules_settings_append --> <!-- EVENT acp_forums_rules_settings_append -->
</fieldset> </fieldset>
</div> </div>
<!-- EVENT acp_forums_custom_settings -->
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend> <legend>{L_SUBMIT}</legend>

6
phpBB/docs/events.md
View File

@@ -22,6 +22,12 @@ acp_email_options_after
* Since: 3.1.2-RC1 * Since: 3.1.2-RC1
* Purpose: Add settings to mass email form * 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 acp_forums_main_settings_append
=== ===
* Location: adm/style/acp_forums.html * Location: adm/style/acp_forums.html