From: dongsheng <dongsheng>
Date: Mon, 16 Jun 2008 09:12:07 +0000 (+0000)
Subject: "MDL-15251, see tracker"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3f4fede509e89eb1369be785f193e8683d31992b;p=moodle.git

"MDL-15251, see tracker"
---

diff --git a/user/view.php b/user/view.php
index c9d37a7345..bb01057b57 100644
--- 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];