From 5e104d5f3a80f55a2ef833c2c580369b3dc7b987 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sun, 15 Apr 2007 15:51:16 +0000
Subject: [PATCH] MDL-9315 fixed incorrect use of localtion (should be city) in
 user profile; merged from MOODLE_18_STABLE together with other changes by Nic

---
 user/view.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user/view.php b/user/view.php
index 71eb5204b7..3dec104c42 100644
--- a/user/view.php
+++ b/user/view.php
@@ -209,7 +209,7 @@
             $countries = get_list_of_countries();
             $location .= $countries[$user->country];
         }
-        print_row(get_string("location").":", $location);
+        print_row(get_string("city").":", $location);
     }
 
     if (has_capability('moodle/user:viewhiddendetails', $coursecontext)) {
@@ -327,7 +327,7 @@
 /// printing roles
     
     if ($rolestring = get_user_roles_in_context($id, $coursecontext->id)) {
-        print_row(get_string('roles').':', $rolestring);
+        print_row(get_string('roles').':', format_string($rolestring, false));
     }
 
 /// Printing groups
-- 
2.39.5