diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-14 20:49:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-14 20:49:13 +0200 |
| commit | 70aa4407d3e045c3ed214e2147110e82a7b0d27c (patch) | |
| tree | f198cd941325b5a017987bc86d5fd10ccd04ce7e /phpBB | |
| parent | 4b8e8df55cce7653132cf67778d18cc66c2f6418 (diff) | |
| parent | 5503c09cd5301a64da0ad9d40f6a4fa11967e931 (diff) | |
| download | forums-70aa4407d3e045c3ed214e2147110e82a7b0d27c.tar forums-70aa4407d3e045c3ed214e2147110e82a7b0d27c.tar.gz forums-70aa4407d3e045c3ed214e2147110e82a7b0d27c.tar.bz2 forums-70aa4407d3e045c3ed214e2147110e82a7b0d27c.tar.xz forums-70aa4407d3e045c3ed214e2147110e82a7b0d27c.zip | |
Merge remote-tracking branch 'VSEphpbb/ticket/14783' into 3.1.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_posting_buttons.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/events.md | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html index 70b6259689..c3c42f8e82 100644 --- a/phpBB/adm/style/acp_posting_buttons.html +++ b/phpBB/adm/style/acp_posting_buttons.html @@ -63,6 +63,7 @@ <!-- ENDIF --> <!-- ENDIF --> </select> + <!-- EVENT acp_posting_buttons_custom_tags_before --> <!-- BEGIN custom_tags --> <input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" /> <!-- END custom_tags --> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 9e10145593..abe702eb25 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -343,6 +343,13 @@ acp_posting_buttons_before * Since: 3.1.0-b4 * Purpose: Add content before BBCode posting buttons in the ACP +acp_posting_buttons_custom_tags_before +=== +* Locations: + + adm/style/acp_posting_buttons.html +* Since: 3.1.10-RC1 +* Purpose: Add content before the custom BBCodes in the ACP + acp_profile_contact_before === * Locations: |