"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 2e829f54dfc8eedf36300d77c7bc8517e07df7a5..c9d37a73458b1b0380fc5bc4d5782614fb28a05a 100644 (file)
--- 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);