From 3f4fede509e89eb1369be785f193e8683d31992b Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Mon, 16 Jun 2008 09:12:07 +0000
Subject: [PATCH] "MDL-15251, see tracker"

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

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