Skip to content

Commit

Permalink
"MDL-15251, fix country field in user/view.php, merged from MOODLE_19…
Browse files Browse the repository at this point in the history
…_STABLE"
  • Loading branch information
dongsheng committed Jun 16, 2008
1 parent 1f8f46e commit ac382d2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion user/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,11 @@
if ($user->city && !isset($hiddenfields['city'])) {
$location .= $user->city;
}
$countries = get_list_of_countries();
if (!empty($countries[$user->country]) && !isset($hiddenfields['country'])) {
if ($user->city && !isset($hiddenfields['country'])) {
$location .= ', ';
}
$countries = get_list_of_countries();
$location .= $countries[$user->country];
}
print_row(get_string("city").":", $location);
Expand Down

0 comments on commit ac382d2

Please sign in to comment.