L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-71099-m311' of https://github.com/sammarshallou/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2021-03-27 10:17:51 +01:00
parent baa15131af 3dee5cd74c
commit b56163cbc1
161 changed files with 420 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tablelib.php
+3 -3
View File
@@ -616,7 +616,7 @@ class flexible_table {
if (isset($this->columns[$column])) {
continue; // This column is OK.
}
if (in_array($column, \core\user_fields::get_name_fields()) &&
if (in_array($column, \core_user\fields::get_name_fields()) &&
isset($this->columns['fullname'])) {
continue; // This column is OK.
}
@@ -1243,7 +1243,7 @@ class flexible_table {
$nameformat = get_string('fullnamedisplay');
}
$requirednames = order_in_string(\core\user_fields::get_name_fields(), $nameformat);
$requirednames = order_in_string(\core_user\fields::get_name_fields(), $nameformat);
if (!empty($requirednames)) {
if ($this->is_sortable($column)) {
@@ -1323,7 +1323,7 @@ class flexible_table {
$sortdata = array_merge([$sortby => $sortorder], $sortdata);
}
$usernamefields = \core\user_fields::get_name_fields();
$usernamefields = \core_user\fields::get_name_fields();
$sortdata = array_filter($sortdata, function($sortby) use ($usernamefields) {
$isvalidsort = $sortby && $this->is_sortable($sortby);
$isvalidsort = $isvalidsort && empty($this->prefs['collapse'][$sortby]);