From e6edcdaff791b194d8403df926acbf8ecf72e1c9 Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Mon, 16 Jun 2008 09:05:42 +0000
Subject: [PATCH] "MDL-15251, see tracker, merged from MOODLE_19_STABLE"

---
 user/view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user/view.php b/user/view.php
index 8eb58411d37..04b3f523dd4 100644
--- a/user/view.php
+++ b/user/view.php
@@ -209,7 +209,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];