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

Merge branch 'MDL-66197-36' of git://github.com/marinaglancy/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2019-10-03 00:45:52 +02:00
parent 6f32cfee2b 48d8fb92ff
commit f30091c8dc
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+1 -10
View File
@@ -7020,21 +7020,12 @@ function current_language() {
*/
function get_parent_language($lang=null) {
// Let's hack around the current language.
if (!empty($lang)) {
$oldforcelang = force_current_language($lang);
}
$parentlang = get_string_manager()->get_string('parentlanguage', 'langconfig', null, $lang);
$parentlang = get_string('parentlanguage', 'langconfig');
if ($parentlang === 'en') {
$parentlang = '';
}
// Let's hack around the current language.
if (!empty($lang)) {
force_current_language($oldforcelang);
}
return $parentlang;
}