mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity

Take out some double-slashes (//) in paths to langfiles and

Browse Source 
included one more file_exists() check to avoid tons of
warnings when looking for files under dataroot mainly.
This commit is contained in:
stronk7 2005-01-11 12:24:37 +00:00
parent b5c5f9286a
commit dc0426bd83
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/moodlelib.php
View File

@ -3092,7 +3092,7 @@ function get_string($identifier, $module='', $a=NULL) {
/// First check all the normal locations for the string in the current language
foreach ($locations as $location) {
$langfile = $location.'/'.$lang.'/'.$module.'.php';
$langfile = $location.$lang.'/'.$module.'.php';
if (file_exists($langfile)) {
if ($result = get_string_from_file($identifier, $langfile, "\$resultstring")) {
eval($result);
@ -3109,15 +3109,17 @@ function get_string($identifier, $module='', $a=NULL) {
/// Is a parent language defined? If so, try to find this string in a parent language file
foreach ($locations as $location) {
$langfile = $location.'/'.$lang.'/moodle.php';
if ($result = get_string_from_file('parentlanguage', $langfile, "\$parentlang")) {
eval($result);
if (!empty($parentlang)) { // found it!
$langfile = $location.'/'.$parentlang.'/'.$module.'.php';
if (file_exists($langfile)) {
if ($result = get_string_from_file($identifier, $langfile, "\$resultstring")) {
eval($result);
return $resultstring;
$langfile = $location.$lang.'/moodle.php';
if (file_exists($langfile)) {
if ($result = get_string_from_file('parentlanguage', $langfile, "\$parentlang")) {
eval($result);
if (!empty($parentlang)) { // found it!
$langfile = $location.$parentlang.'/'.$module.'.php';
if (file_exists($langfile)) {
if ($result = get_string_from_file($identifier, $langfile, "\$resultstring")) {
eval($result);
return $resultstring;
}
}
}
}
@ -3127,7 +3129,7 @@ function get_string($identifier, $module='', $a=NULL) {
/// Our only remaining option is to try English
foreach ($locations as $location) {
$langfile = $location.'/en/'.$module.'.php';
$langfile = $location.'en/'.$module.'.php';
if (file_exists($langfile)) {
if ($result = get_string_from_file($identifier, $langfile, "\$resultstring")) {