diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-18 20:50:38 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-18 20:50:38 +0100 |
| commit | 60af11da9d521f938ddb2e68b6e26424ad679772 (patch) | |
| tree | de4be1cd0c06e25729d98616f361b7d4c11ebb55 /phpBB | |
| parent | bef0b15dbd9e66d47680691fb71f1ce8b44def5b (diff) | |
| parent | 956c7186ec00630c3465400c5585fd4c550d06e1 (diff) | |
| download | forums-60af11da9d521f938ddb2e68b6e26424ad679772.tar forums-60af11da9d521f938ddb2e68b6e26424ad679772.tar.gz forums-60af11da9d521f938ddb2e68b6e26424ad679772.tar.bz2 forums-60af11da9d521f938ddb2e68b6e26424ad679772.tar.xz forums-60af11da9d521f938ddb2e68b6e26424ad679772.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_register.html | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d33163ad84..59fc184136 100644 --- 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 index 655c0fc48c..38413addba 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -79,8 +79,6 @@ <!-- ENDIF --> <!-- IF S_COPPA --> - - <div class="panel"> <div class="inner"> @@ -91,6 +89,8 @@ </div> <!-- ENDIF --> +<!-- EVENT ucp_register_buttons_before --> + <div class="panel"> <div class="inner"> |