mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-61658 user: Fix displaying of user's country name

Browse Source 
In these cases we want to use the method get_list_of_countries() to
obtain translated names of all potential country codes. The country code
is already there in the database. So it does not matter if the country
is among those whitelisted in $CFG->allcountrycodes - we want to see its
name anyway.
This commit is contained in:
David Mudrák 2018-03-15 13:17:31 +01:00
parent 60e213470d
commit 0c98acefc1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/user.php
View File

@ -246,7 +246,7 @@
} else {
$countries = get_string_manager()->get_list_of_countries(false);
$countries = get_string_manager()->get_list_of_countries(true);
if (empty($mnethosts)) {
$mnethosts = $DB->get_records('mnet_host', null, 'id', 'id,wwwroot,name');
}

2
blocks/myprofile/block_myprofile.php
View File

@ -75,7 +75,7 @@ class block_myprofile extends block_base {
$this->content->text .= '<div class="myprofileitem fullname">'.fullname($USER).'</div>';
if(!isset($this->config->display_country) || $this->config->display_country == 1) {
$countries = get_string_manager()->get_list_of_countries();
$countries = get_string_manager()->get_list_of_countries(true);
if (isset($countries[$USER->country])) {
$this->content->text .= '<div class="myprofileitem country">';
$this->content->text .= get_string('country') . ': ' . $countries[$USER->country];

2
user/classes/participants_table.php
View File

@ -229,7 +229,7 @@ class participants_table extends \table_sql {
$this->enrolid = $enrolid;
$this->status = $status;
$this->selectall = $selectall;
$this->countries = get_string_manager()->get_list_of_countries();
$this->countries = get_string_manager()->get_list_of_countries(true);
$this->extrafields = $extrafields;
$this->context = $context;
if ($canseegroups) {