From: dongsheng <dongsheng>
Date: Mon, 16 Jun 2008 02:14:59 +0000 (+0000)
Subject: "MDL-15251, fix country field in user/view.php, merged from MOODLE_19_STABLE"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ac382d2b6450d749771c126666e6118d0c00e759;p=moodle.git

"MDL-15251, fix country field in user/view.php, merged from MOODLE_19_STABLE"
---

diff --git a/user/view.php b/user/view.php
index 2e829f54df..c9d37a7345 100644
--- a/user/view.php
+++ b/user/view.php
@@ -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);