"MDL-15251, see tracker, merged from MOODLE_19_STABLE"
This commit is contained in:
+7
-12
@@ -202,19 +202,13 @@
|
||||
|
||||
echo '<table class="list">';
|
||||
|
||||
if (($user->city or $user->country) and (!isset($hiddenfields['city']) or !isset($hiddenfields['country']))) {
|
||||
$location = '';
|
||||
if ($user->city && !isset($hiddenfields['city'])) {
|
||||
$location .= $user->city;
|
||||
}
|
||||
if (! isset($hiddenfields['country']) && $user->country) {
|
||||
$countries = get_list_of_countries();
|
||||
if (!empty($countries[$user->country]) && !isset($hiddenfields['country'])) {
|
||||
if ($user->city && !isset($hiddenfields['city']) && !isset($hiddenfields['country'])) {
|
||||
$location .= ', ';
|
||||
}
|
||||
$location .= $countries[$user->country];
|
||||
}
|
||||
print_row(get_string("city").":", $location);
|
||||
print_row(get_string('country') . ':', $countries[$user->country]);
|
||||
}
|
||||
|
||||
if (! isset($hiddenfields['city']) && $user->city) {
|
||||
print_row(get_string('city') . ':', $user->city);
|
||||
}
|
||||
|
||||
if (has_capability('moodle/user:viewhiddendetails', $coursecontext)) {
|
||||
@@ -478,3 +472,4 @@ function print_row($left, $right) {
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user