diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 18:12:53 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 18:12:53 +0200 |
| commit | b28fe0a7fa128e3fc055e8a661673cee894ceee5 (patch) | |
| tree | a5d62f5d535a61dc39cf1de516a26396160a7fcb | |
| parent | 722fe0ca482aa4f0ff757cdf0651f461e35ba1f1 (diff) | |
| parent | 85e4566223487899f3a2789983cb50e68296a982 (diff) | |
| download | forums-b28fe0a7fa128e3fc055e8a661673cee894ceee5.tar forums-b28fe0a7fa128e3fc055e8a661673cee894ceee5.tar.gz forums-b28fe0a7fa128e3fc055e8a661673cee894ceee5.tar.bz2 forums-b28fe0a7fa128e3fc055e8a661673cee894ceee5.tar.xz forums-b28fe0a7fa128e3fc055e8a661673cee894ceee5.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14786] Add mcp_forum_actions_before/after events
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_forum.html | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 45e6db301c..80271c6419 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -765,6 +765,20 @@ mcp_ban_unban_before * Since: 3.1.0-RC3 * Purpose: Add additional fields to the unban form in MCP +mcp_forum_actions_after +=== +* Locations: + + styles/prosilver/template/mcp_forum.html +* Since: 3.1.11-RC1 +* Purpose: Add some information after actions fieldset + +mcp_forum_actions_before +=== +* Locations: + + styles/prosilver/template/mcp_forum.html +* Since: 3.1.11-RC1 +* Purpose: Add some information before actions fieldset + mcp_forum_topic_title_before === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 8f24c4128e..b4ef9e66af 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -124,6 +124,7 @@ </div> </div> +<!-- EVENT mcp_forum_actions_before --> <fieldset class="display-actions"> <!-- IF not S_MERGE_SELECT --> <select name="action"> @@ -145,6 +146,7 @@ <!-- ENDIF --> {S_FORM_TOKEN} </fieldset> +<!-- EVENT mcp_forum_actions_after --> </form> <!-- INCLUDE mcp_footer.html --> |