Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.4] Incorrect message for user fields #41513

Closed
wants to merge 9 commits into from
Closed

[4.4] Incorrect message for user fields #41513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5355b8d
[4.3] Incorrect message for user fields
brianteeman Aug 29, 2023
b728b36
tidy
brianteeman Aug 29, 2023
7555aad
Merge branch '4.3-dev' into user-field
Quy Aug 29, 2023
ea69eca
Merge branch '4.3-dev' into user-field
brianteeman Aug 29, 2023
f1e143d
Merge branch '4.4-dev' into user-field
brianteeman Sep 14, 2023
3db8c0b
Merge branch '4.4-dev' into user-field
laoneo Sep 18, 2023
ea5a035
Merge branch '4.4-dev' into user-field
brianteeman Sep 26, 2023
781532f
Merge branch '4.4-dev' into user-field
MacJoom Nov 10, 2023
0ae954b
Update default_custom.php
brianteeman Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions administrator/components/com_users/src/Service/HTML/Users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,6 @@ public function value($value)
if (is_string($value)) {
$value = trim($value);
}

if (empty($value)) {
return Text::_('COM_USERS_PROFILE_VALUE_NOT_FOUND');
} elseif (!is_array($value)) {
return htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion components/com_users/tmpl/profile/default_custom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</dt>
<dd>
<?php if (array_key_exists($field->fieldname, $customFields)) : ?>
<?php echo strlen($customFields[$field->fieldname]->value) ? $customFields[$field->fieldname]->value : Text::_('COM_USERS_PROFILE_VALUE_NOT_FOUND'); ?>
<?php echo strlen($customFields[$field->fieldname]->value) ? $customFields[$field->fieldname]->value : ''; ?>
<?php elseif (HTMLHelper::isRegistered('users.' . $field->id)) : ?>
<?php echo HTMLHelper::_('users.' . $field->id, $field->value); ?>
<?php elseif (HTMLHelper::isRegistered('users.' . $field->fieldname)) : ?>
Expand Down
2 changes: 1 addition & 1 deletion components/com_users/tmpl/profile/default_params.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<?php elseif (HTMLHelper::isRegistered('users.' . $field->type)) : ?>
<?php echo HTMLHelper::_('users.' . $field->type, $field->value); ?>
<?php else : ?>
<?php echo HTMLHelper::_('users.value', $field->value); ?>
<?php echo strlen($field->value) ? $field->value : Text::_('COM_USERS_PROFILE_VALUE_NOT_FOUND'); ?>
<?php endif; ?>
</dd>
<?php endif; ?>
Expand Down
3 changes: 1 addition & 2 deletions plugins/system/webauthn/src/PluginTraits/UserProfileFields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ trait UserProfileFields
/**
* HTMLHelper method to render the WebAuthn user profile field in the profile view page.
*
* Instead of showing a nonsensical "Website default" label next to the field, this method
* displays the number and names of authenticators already registered by the user.
* This method displays the number and names of authenticators already registered by the user.
*
* This static method is set up for use in the onContentPrepareData method of this plugin.
*
Expand Down