mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 16:32:18 +02:00
make_default_scale() now searches properly under
both dataroot and dirroot, defaulting to en_utf8. Bug 5719. (http://moodle.org/bugs/bug.php?op=show&bugid=5719) Merged from MOODLE_16_STABLE
This commit is contained in:
parent
ae57b07c06
commit
ee6e91d4af
@ -2501,12 +2501,16 @@ function make_default_scale() {
|
||||
/// Read in the big description from the file. Note this is not
|
||||
/// HTML (despite the file extension) but Moodle format text.
|
||||
$parentlang = get_string('parentlang');
|
||||
if (is_readable($CFG->dirroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html')) {
|
||||
if (is_readable($CFG->dataroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html')) {
|
||||
$file = file($CFG->dataroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html');
|
||||
} else if (is_readable($CFG->dirroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html')) {
|
||||
$file = file($CFG->dirroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html');
|
||||
} else if ($parentlang and is_readable($CFG->dataroot .'/lang/'. $parentlang .'/help/forum/ratings.html')) {
|
||||
$file = file($CFG->dataroot .'/lang/'. $parentlang .'/help/forum/ratings.html');
|
||||
} else if ($parentlang and is_readable($CFG->dirroot .'/lang/'. $parentlang .'/help/forum/ratings.html')) {
|
||||
$file = file($CFG->dirroot .'/lang/'. $parentlang .'/help/forum/ratings.html');
|
||||
} else if (is_readable($CFG->dirroot .'/lang/en/help/forum/ratings.html')) {
|
||||
$file = file($CFG->dirroot .'/lang/en/help/forum/ratings.html');
|
||||
} else if (is_readable($CFG->dirroot .'/lang/en_utf8/help/forum/ratings.html')) {
|
||||
$file = file($CFG->dirroot .'/lang/en_utf8/help/forum/ratings.html');
|
||||
} else {
|
||||
$file = '';
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user