MDL-45242 Lib: Replace calls to deprecated functions

In all cases changes have been kept to a minimum while not making
the code completely horrible. For example, there are many instances
where it would probably be better to rewrite a query entirely, but
I have not done that (in order to reduce the risk of changes).
This commit is contained in:
sam marshall
2021-03-10 10:58:09 +00:00
parent 5b7b1b9a06
commit 0919a04311
152 changed files with 612 additions and 394 deletions
+10 -3
View File
@@ -480,7 +480,7 @@ function useredit_get_enabled_name_fields() {
global $CFG;
// Get all of the other name fields which are not ranked as necessary.
$additionalusernamefields = array_diff(get_all_user_name_fields(), array('firstname', 'lastname'));
$additionalusernamefields = array_diff(\core\user_fields::get_name_fields(), array('firstname', 'lastname'));
// Find out which additional name fields are actually being used from the fullnamedisplay setting.
$enabledadditionalusernames = array();
foreach ($additionalusernamefields as $enabledname) {
@@ -507,7 +507,14 @@ function useredit_get_disabled_name_fields($enabledadditionalusernames = null) {
}
// These are the additional fields that are not currently enabled.
$nonusednamefields = array_diff(get_all_user_name_fields(),
$nonusednamefields = array_diff(\core\user_fields::get_name_fields(),
array_merge(array('firstname', 'lastname'), $enabledadditionalusernames));
return $nonusednamefields;
// It may not be significant anywhere, but for compatibility, this used to return an array
// with keys and values the same.
$result = [];
foreach ($nonusednamefields as $field) {
$result[$field] = $field;
}
return $result;
}