mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-12 18:45:20 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2023-10-02 21:02:08 +02:00
commit 368239a0fc
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/profilefields/manager.php
View File

@ -148,6 +148,8 @@ class manager
break; break;
} }
$has_required = false;
$sql = 'SELECT l.*, f.* $sql = 'SELECT l.*, f.*
FROM ' . $this->fields_lang_table . ' l, FROM ' . $this->fields_lang_table . ' l,
' . $this->fields_table . ' f ' . $this->fields_table . ' f
@ -162,6 +164,8 @@ class manager
/** @var \phpbb\profilefields\type\type_interface $profile_field */ /** @var \phpbb\profilefields\type\type_interface $profile_field */
$profile_field = $this->type_collection[$row['field_type']]; $profile_field = $this->type_collection[$row['field_type']];
$has_required = $has_required || $row['field_required'];
$this->template->assign_block_vars('profile_fields', [ $this->template->assign_block_vars('profile_fields', [
'FIELD' => $profile_field->process_field_row('change', $row), 'FIELD' => $profile_field->process_field_row('change', $row),
'FIELD_ID' => $profile_field->get_field_ident($row), 'FIELD_ID' => $profile_field->get_field_ident($row),
@ -171,6 +175,8 @@ class manager
]); ]);
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$this->template->assign_var('PROFILE_FIELDS_REQUIRED', $has_required);
} }
/** /**

4
phpBB/styles/prosilver/template/ucp_register.html
View File

@ -78,8 +78,7 @@
<!-- INCLUDE timezone_option.html --> <!-- INCLUDE timezone_option.html -->
<!-- EVENT ucp_register_profile_fields_before --> <!-- EVENT ucp_register_profile_fields_before -->
<!-- IF .profile_fields --> {% if PROFILE_FIELDS_REQUIRED %}<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>{% endif %}
<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>
<!-- BEGIN profile_fields --> <!-- BEGIN profile_fields -->
<dl> <dl>
@ -89,7 +88,6 @@
<dd>{profile_fields.FIELD}</dd> <dd>{profile_fields.FIELD}</dd>
</dl> </dl>
<!-- END profile_fields --> <!-- END profile_fields -->
<!-- ENDIF -->
<!-- EVENT ucp_register_profile_fields_after --> <!-- EVENT ucp_register_profile_fields_after -->
</fieldset> </fieldset>