Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-09-14 20:51:42 +02:00
commit 53d96f66e5
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 8 additions and 0 deletions

View file

@ -63,6 +63,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->
</select> </select>
<!-- EVENT acp_posting_buttons_custom_tags_before -->
<!-- BEGIN custom_tags --> <!-- 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}" /> <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 --> <!-- END custom_tags -->

View file

@ -343,6 +343,13 @@ acp_posting_buttons_before
* Since: 3.1.0-b4 * Since: 3.1.0-b4
* Purpose: Add content before BBCode posting buttons in the ACP * 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 acp_profile_contact_before
=== ===
* Locations: * Locations: