mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-11 10:05:19 +02:00
Merge branch '3.3.x'
This commit is contained in:
commit
368239a0fc
@ -148,6 +148,8 @@ class manager
|
||||
break;
|
||||
}
|
||||
|
||||
$has_required = false;
|
||||
|
||||
$sql = 'SELECT l.*, f.*
|
||||
FROM ' . $this->fields_lang_table . ' l,
|
||||
' . $this->fields_table . ' f
|
||||
@ -162,6 +164,8 @@ class manager
|
||||
/** @var \phpbb\profilefields\type\type_interface $profile_field */
|
||||
$profile_field = $this->type_collection[$row['field_type']];
|
||||
|
||||
$has_required = $has_required || $row['field_required'];
|
||||
|
||||
$this->template->assign_block_vars('profile_fields', [
|
||||
'FIELD' => $profile_field->process_field_row('change', $row),
|
||||
'FIELD_ID' => $profile_field->get_field_ident($row),
|
||||
@ -171,6 +175,8 @@ class manager
|
||||
]);
|
||||
}
|
||||
$this->db->sql_freeresult($result);
|
||||
|
||||
$this->template->assign_var('PROFILE_FIELDS_REQUIRED', $has_required);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -78,8 +78,7 @@
|
||||
<!-- INCLUDE timezone_option.html -->
|
||||
|
||||
<!-- EVENT ucp_register_profile_fields_before -->
|
||||
<!-- IF .profile_fields -->
|
||||
<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>
|
||||
{% if PROFILE_FIELDS_REQUIRED %}<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>{% endif %}
|
||||
|
||||
<!-- BEGIN profile_fields -->
|
||||
<dl>
|
||||
@ -89,7 +88,6 @@
|
||||
<dd>{profile_fields.FIELD}</dd>
|
||||
</dl>
|
||||
<!-- END profile_fields -->
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- EVENT ucp_register_profile_fields_after -->
|
||||
</fieldset>
|
||||
|
Loading…
x
Reference in New Issue
Block a user