L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-61658-34-allcountrycodes' of git://github.com/mudrd8mz/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-03-21 19:37:55 +01:00
parent 6966cdc45b c3ab217820
commit 05866360b7
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/user.php
+1 -1
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');
}
auth/classes/digital_consent.php
+1 -1
View File
@@ -71,7 +71,7 @@ class digital_consent {
public static function parse_age_digital_consent_map($ageconsentmap) {
$ageconsentmapparsed = array();
$countries = get_string_manager()->get_list_of_countries();
$countries = get_string_manager()->get_list_of_countries(true);
$isdefaultvaluepresent = false;
$lines = preg_split('/\r|\n/', $ageconsentmap, -1, PREG_SPLIT_NO_EMPTY);
foreach ($lines as $line) {
blocks/myprofile/block_myprofile.php
+1 -1
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];
user/classes/participants_table.php
+1 -1
View File
@@ -226,7 +226,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) {