mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-77723 user: ensure identity refers to a valid custom profile field.

Browse Source
This commit is contained in:
Paul Holden 2023-03-23 09:53:44 +00:00
parent 063ffc8073
commit 2881840cca
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
user/classes/fields.php
View File

@ -377,9 +377,13 @@ class fields {
$allowed = false;
if ($allowcustom) {
require_once($CFG->dirroot . '/user/profile/lib.php');
// Ensure the field exists (it may have been deleted since user identity was configured).
$field = profile_get_custom_field_data_by_shortname($matches[1], false);
$fieldinstance = profile_get_user_field($field->datatype, $field->id, 0, $field);
$allowed = $fieldinstance->is_visible($context);
if ($field !== null) {
$fieldinstance = profile_get_user_field($field->datatype, $field->id, 0, $field);
$allowed = $fieldinstance->is_visible($context);
}
}
if (!$allowed) {
unset($extra[$key]);

22
user/tests/fields_test.php
View File

@ -22,6 +22,7 @@ namespace core_user;
* @package core
* @copyright 2014 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \core_user\fields
*/
class fields_test extends \advanced_testcase {
@ -153,6 +154,27 @@ class fields_test extends \advanced_testcase {
fields::get_identity_fields($usercontext, false));
}
/**
* Test getting identity fields, when one of them refers to a non-existing custom profile field
*/
public function test_get_identity_fields_invalid(): void {
$this->resetAfterTest();
$this->getDataGenerator()->create_custom_profile_field([
'datatype' => 'text',
'shortname' => 'real',
'name' => 'I\'m real',
]);
// The "fake" profile field does not exist.
set_config('showuseridentity', 'email,profile_field_real,profile_field_fake');
$this->assertEquals([
'email',
'profile_field_real',
], fields::get_identity_fields(null));
}
/**
* Tests the get_required_fields function.
*