makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6552 from marc1706/ticket/12904

Browse source 
[ticket/12904] Do not display info about required fields without any
This commit is contained in:
Marc Alexander 2023-10-02 21:02:05 +02:00
commit 9dec6d3176
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/phpbb/profilefields/manager.php
View file

@ -154,8 +154,10 @@ 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
WHERE l.field_id = f.field_id WHERE l.field_id = f.field_id
AND f.field_active = 1 AND f.field_active = 1
@ -168,6 +170,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),
@ -177,6 +181,8 @@ class manager
]); ]);
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$this->template->assign_var('PROFILE_FIELDS_REQUIRED', $has_required);
} }
/** /**
@ -192,7 +198,7 @@ class manager
$sql_where = !$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_') ? ' AND f.field_hide = 0' : ''; $sql_where = !$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_') ? ' AND f.field_hide = 0' : '';
$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
WHERE l.field_id = f.field_id WHERE l.field_id = f.field_id
AND f.field_active = 1 AND f.field_active = 1
@ -241,7 +247,7 @@ class manager
} }
$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
WHERE l.field_id = f.field_id WHERE l.field_id = f.field_id
AND f.field_active = 1 AND f.field_active = 1

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

@ -67,8 +67,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>
@ -78,7 +77,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>