"MDL-15251, see tracker"

diff --git a/user/view.php b/user/view.php
index c9d37a73458b1b0380fc5bc4d5782614fb28a05a..bb01057b57402025afed8b4992c79d33b4222b01 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -218,7 +218,7 @@
         }
         $countries = get_list_of_countries();
         if (!empty($countries[$user->country]) && !isset($hiddenfields['country'])) {
-            if ($user->city && !isset($hiddenfields['country'])) {
+            if ($user->city && !isset($hiddenfields['city'] && !isset($hiddenfields['country'])) {
                 $location .= ', ';
             }
             $location .= $countries[$user->country];