aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-09-23 17:37:17 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-09-23 17:37:17 +0200
commitf4935ef500be2f3ab3181d488c4946d9e5124555 (patch)
treed3d6ee9319b132404c6558aec5b89693675a088d
parentba945496b44be5a43330a503893e080394188476 (diff)
parent9217b85c68bbe18a4357a6ca187d2dda17fee803 (diff)
downloadforums-f4935ef500be2f3ab3181d488c4946d9e5124555.tar
forums-f4935ef500be2f3ab3181d488c4946d9e5124555.tar.gz
forums-f4935ef500be2f3ab3181d488c4946d9e5124555.tar.bz2
forums-f4935ef500be2f3ab3181d488c4946d9e5124555.tar.xz
forums-f4935ef500be2f3ab3181d488c4946d9e5124555.zip
Merge branch '3.2.x' into 3.3.x
-rw-r--r--phpBB/adm/style/acp_groups.html2
-rw-r--r--phpBB/docs/events.md12
2 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 8eec3b63c6..8651b63b7f 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -36,10 +36,12 @@
<dl>
<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
<dd>
+ {% EVENT acp_group_types_prepend %}
<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
+ {% EVENT acp_group_types_append %}
</dd>
</dl>
<!-- ELSE -->
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 467b03e8f3..4be1725090 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -172,6 +172,18 @@ acp_group_options_before
* Since: 3.1.0-b4
* Purpose: Add additional options to group settings (before GROUP_FOUNDER_MANAGE)
+acp_group_types_append
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.2.9-RC1
+* Purpose: Add additional group type options to group settings (append the list)
+
+acp_group_types_prepend
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.2.9-RC1
+* Purpose: Add additional group type options to group settings (prepend the list)
+
acp_groups_find_username_append
===
* Location: adm/style/acp_groups.html