Merge branch 'MDL-60776-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE

This commit is contained in:
David Monllao
2018-01-15 10:58:58 +01:00
+3 -4
View File
@@ -194,11 +194,10 @@ if ($fullusernames == 'language' || empty($fullusernames)) {
$a->firstname = 'firstname';
$a->lastname = 'lastname';
// Getting the fullname display will ensure that the order in the language file is maintained.
$usernameheader = explode(' ', get_string('fullnamedisplay', null, $a));
} else {
// If everything is as expected then put them in the order specified by the alternative full name format setting.
$usernameheader = order_in_string($allusernames, $fullusernames);
$fullusernames = get_string('fullnamedisplay', null, $a);
}
// If everything is as expected then put them in the order specified by the alternative full name format setting.
$usernameheader = order_in_string($allusernames, $fullusernames);
// Loop through each name and return the language string.
foreach ($usernameheader as $key => $username) {