diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-07-16 21:25:17 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-07-16 21:25:17 +0200 |
| commit | 019e85d0644cc7c19b29b7d7524f7fe288928abf (patch) | |
| tree | 371c86eab41e7899f487dfd8572cf0f84ce10a2f | |
| parent | b14c088ce7331bfa76c701087e9358ca8bda5dae (diff) | |
| parent | b54aa81cdd4e55daf9537c9dde93d4fc9d1396be (diff) | |
| download | forums-019e85d0644cc7c19b29b7d7524f7fe288928abf.tar forums-019e85d0644cc7c19b29b7d7524f7fe288928abf.tar.gz forums-019e85d0644cc7c19b29b7d7524f7fe288928abf.tar.bz2 forums-019e85d0644cc7c19b29b7d7524f7fe288928abf.tar.xz forums-019e85d0644cc7c19b29b7d7524f7fe288928abf.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/subsilver2/template/mcp_move.html
| -rw-r--r-- | phpBB/docs/events.md | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_move.html | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index ea081350a4..24ea9a6422 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -807,6 +807,14 @@ mcp_front_latest_unapproved_before * Since: 3.1.3-RC1 * Purpose: Add content before latest unapproved posts list +mcp_move_before +=== +* Locations: + + styles/prosilver/template/mcp_move.html + + styles/subsilver2/template/mcp_move.html +* Since: 3.1.10-RC1 +* Purpose: Add content before 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 876829a088..45a9ae83bc 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -31,6 +31,8 @@ <!-- INCLUDE overall_header.html --> +<!-- EVENT mcp_move_before --> + <form id="confirm" action="{S_CONFIRM_ACTION}" method="post"> <div class="panel"> |