From 416527fd73ab7037b30147dc9151c1bfba497bc4 Mon Sep 17 00:00:00 2001
From: Michael Milette <michael.milette@tngconsulting.ca>
Date: Wed, 24 Nov 2021 10:19:43 -0500
Subject: [PATCH] MDL-73156 user: Custom user profile field names now filtered.

---
 user/filters/profilefield.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
index 328ad70c0bc..23e575afbda 100644
--- a/user/filters/profilefield.php
+++ b/user/filters/profilefield.php
@@ -77,6 +77,9 @@ class user_filter_profilefield extends user_filter_type {
         require_once($CFG->dirroot . '/user/profile/lib.php');
 
         $fieldrecords = profile_get_custom_fields();
+        foreach ($fieldrecords as $key => $fieldrecord) {
+            $fieldrecords[$key]->name = format_string($fieldrecords[$key]->name, false, ['context' => context_system::instance()]);
+        }
         $fields = array_combine(array_keys($fieldrecords), array_column($fieldrecords, 'name'));
         core_collator::asort($fields);
         $res = array(0 => get_string('anyfield', 'filters'));