aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-07-29 21:43:37 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-07-29 21:43:37 +0200
commit2e634e9f96b460150344c96df48970cce6783f63 (patch)
tree01922be502775ab726c47e0a5ff4f115fb354d28
parente086d4039e0811aa8eac92ac83f2ca94d494f85b (diff)
parent207b678896d8d46f8e5b5cca05beffcbd89e11d3 (diff)
downloadforums-2e634e9f96b460150344c96df48970cce6783f63.tar
forums-2e634e9f96b460150344c96df48970cce6783f63.tar.gz
forums-2e634e9f96b460150344c96df48970cce6783f63.tar.bz2
forums-2e634e9f96b460150344c96df48970cce6783f63.tar.xz
forums-2e634e9f96b460150344c96df48970cce6783f63.zip
Merge branch '3.2.x' into 3.3.x
-rw-r--r--phpBB/docs/events.md14
-rw-r--r--phpBB/styles/prosilver/template/mcp_move.html2
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 39888bf671..b81b503d0e 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -988,6 +988,20 @@ mcp_move_before
* Since: 3.1.10-RC1
* Purpose: Add content before move topic/post form
+mcp_move_destination_forum_after
+===
+* Locations:
+ + styles/prosilver/template/mcp_move.html
+* Since: 3.2.8-RC1
+* Purpose: Add content after the destination select element in the move topic/post form
+
+mcp_move_destination_forum_before
+===
+* Locations:
+ + styles/prosilver/template/mcp_move.html
+* Since: 3.2.8-RC1
+* Purpose: Add content before the destination select element in the move topic/post form
+
mcp_post_additional_options
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html
index 45a9ae83bc..63197ef274 100644
--- a/phpBB/styles/prosilver/template/mcp_move.html
+++ b/phpBB/styles/prosilver/template/mcp_move.html
@@ -43,12 +43,14 @@
<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
<fieldset>
+ {% EVENT mcp_move_destination_forum_before %}
<dl class="fields2">
<dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt>
<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->
<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF -->
</dl>
+ {% EVENT mcp_move_destination_forum_after %}
<dl class="fields2">
<dt>&nbsp;</dt>
<dd><strong>{MESSAGE_TEXT}</strong></dd>