diff options
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_register.html | 8 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_register.html | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 70026d724b..02050416b8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -166,6 +166,7 @@ <li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li> <li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li> <li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</li> + <li>[Fix] Display required fields notice on registration above the custom profile fields. (Bug #39665)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 822293973d..7ec245bdcb 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -26,9 +26,6 @@ <!-- IF L_REG_COND --> <dl><dd><strong>{L_REG_COND}</strong></dd></dl> <!-- ENDIF --> - <!-- IF .profile_fields --> - <dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl> - <!-- ENDIF --> <dl> <dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> @@ -62,6 +59,9 @@ <dd><select name="tz" id="tz" class="autowidth">{S_TZ_OPTIONS}</select></dd> </dl> + <!-- IF .profile_fields --> + <dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl> + <!-- BEGIN profile_fields --> <dl> <dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label> @@ -70,6 +70,8 @@ <dd>{profile_fields.FIELD}</dd> </dl> <!-- END profile_fields --> + <!-- ENDIF --> + </fieldset> <span class="corners-bottom"><span></span></span></div> </div> diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index fc3e4c119f..ebcdf2d76b 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -32,11 +32,6 @@ <td class="row2" colspan="2"><span class="gensmall">{L_REG_COND}</span></td> </tr> <!-- ENDIF --> -<!-- IF .profile_fields --> - <tr> - <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> - </tr> -<!-- ENDIF --> <tr> <td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> @@ -66,6 +61,10 @@ <td class="row1"><b class="genmed">{L_TIMEZONE}: </b></td> <td class="row2"><select name="tz">{S_TZ_OPTIONS}</select></td> </tr> +<!-- IF .profile_fields --> + <tr> + <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> + </tr> <!-- BEGIN profile_fields --> <tr> <td class="row1" width="35%"> @@ -77,6 +76,7 @@ </tr> <!-- END profile_fields --> +<!-- ENDIF --> <!-- IF CAPTCHA_TEMPLATE --> <!-- INCLUDE {CAPTCHA_TEMPLATE} --> |