aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-09-14 20:51:13 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-09-14 20:51:13 +0200
commit142f937354f4324cfd0bd1b2d991a3886ba1d464 (patch)
tree2dfcccfb1fe1782fc38ba18d46f290a5b2ebc33b /phpBB/adm
parent1a187e0607aeb23dc7f95fec0e3163898c2375f4 (diff)
parent70aa4407d3e045c3ed214e2147110e82a7b0d27c (diff)
downloadforums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar.gz
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar.bz2
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar.xz
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/style/acp_posting_buttons.html1
1 files changed, 1 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 -->