Merge branch '3.1.x' into 3.2.x

Xylent · Dec 18, 2016 · 60af11d · 60af11d
2 parents bef0b15 + 956c718
commit 60af11d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
@@ -2123,6 +2123,13 @@ ucp_profile_register_details_after
 * Since: 3.1.4-RC1
 * Purpose: Add options in profile page fieldset - after confirm password field.
 
+ucp_register_buttons_before
+===
+* Locations:
+    + styles/prosilver/template/ucp_register.html
+* Since: 3.1.11-RC1
+* Purpose: Add content before buttons in registration form.
+
 ucp_register_credentials_before
 ===
 * Locations:

diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
@@ -79,8 +79,6 @@ <h2>{SITENAME} - {L_REGISTRATION}</h2>
 <!-- ENDIF -->
 
 <!-- IF S_COPPA -->
-
-
 <div class="panel">
 	<div class="inner">
 
@@ -91,6 +89,8 @@ <h4>{L_COPPA_COMPLIANCE}</h4>
 </div>
 <!-- ENDIF -->
 
+<!-- EVENT ucp_register_buttons_before -->
+
 <div class="panel">
 	<div class="inner">