mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-7242 eliminate last use of location to refer to city in profile where

Browse Source 
it causes problems for translators
merged from MOODLE_19_STABLE
This commit is contained in:
poltawski 2007-12-29 15:38:14 +00:00
parent 953afed21b
commit 357f787bbc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/weblib.php
View File

@ -4377,7 +4377,7 @@ function print_user($user, $course, $messageselect=false, $return=false) {
if (empty($string)) { // Cache all the strings for the rest of the page
$string->email = get_string('email');
$string->location = get_string('location');
$string->city = get_string('city');
$string->lastaccess = get_string('lastaccess');
$string->activity = get_string('activity');
$string->unenrol = get_string('unenrol');
@ -4424,7 +4424,7 @@ has_capability('moodle/course:viewhiddenuserfields', $context)) {
$output .= $string->email .': <a href="mailto:'. $user->email .'">'. $user->email .'</a><br />';
}
if (($user->city or $user->country) and (!isset($hiddenfields['city']) or !isset($hiddenfields['country']))) {
$output .= $string->location .': ';
$output .= $string->city .': ';
if ($user->city && !isset($hiddenfields['city'])) {
$output .= $user->city;
}