MDL-9315 fixed incorrect use of localtion (should be city) in user profile; merged...

diff --git a/user/view.php b/user/view.php
index 71eb5204b7678f0090036764c400f51d8c59a0e9..3dec104c427fd5a3c077f0dec1ffeba6abff0670 100644 (file)
--- 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