mirror of
https://github.com/moodle/moodle.git
synced 2025-01-17 21:49:15 +01:00
MDL-12291 help.php is now able to skip _local langpacks. Merged from MOODLE_19_STABLE
This commit is contained in:
parent
ff396fd597
commit
45f5cfd4bf
20
help.php
20
help.php
@ -18,6 +18,7 @@ $file = optional_param('file', '', PARAM_PATH);
|
||||
$text = optional_param('text', 'No text to display', PARAM_CLEAN);
|
||||
$module = optional_param('module', 'moodle', PARAM_ALPHAEXT);
|
||||
$forcelang = optional_param('forcelang', '', PARAM_SAFEDIR);
|
||||
$skiplocal = optional_param('skiplocal', 0, PARAM_INT); // shall _local help files be skipped?
|
||||
|
||||
// Start the output.
|
||||
print_header(get_string('help'));
|
||||
@ -38,17 +39,18 @@ if (!empty($file)) {
|
||||
$langs = array($forcelang, 'en_utf8');
|
||||
}
|
||||
|
||||
// _local language packs take precedence with both forced language and non-forced language settings
|
||||
$xlangs = array();
|
||||
foreach ($langs as $lang) {
|
||||
if (!empty($lang)) {
|
||||
$xlangs[] = $lang . '_local';
|
||||
$xlangs[] = $lang;
|
||||
if (!$skiplocal) {
|
||||
// _local language packs take precedence with both forced language and non-forced language settings
|
||||
$xlangs = array();
|
||||
foreach ($langs as $lang) {
|
||||
if (!empty($lang)) {
|
||||
$xlangs[] = $lang . '_local';
|
||||
$xlangs[] = $lang;
|
||||
}
|
||||
}
|
||||
$langs = $xlangs;
|
||||
unset($xlangs);
|
||||
}
|
||||
$langs = $xlangs;
|
||||
unset($xlangs);
|
||||
|
||||
|
||||
// Define possible locations for help file similar to locations for language strings
|
||||
// Note: Always retain module directory as before
|
||||
|
Loading…
x
Reference in New Issue
Block a user