mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merged from MOODLE_19_STABLE. Do not produce PHP warnings in case string file does not define array $string[]

Browse Source
This commit is contained in:
mudrd8mz 2007-12-04 21:52:16 +00:00
parent ade79a4768
commit 1dfc37b8fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/lang.php
View File

@ -225,7 +225,7 @@
}
// $enstring = English strings distributed either in the core space or in plugin space
include($enfilepath);
$enstring = $string;
$enstring = isset($string) ? $string : array();
unset($string);
ksort($enstring);
@ -234,7 +234,7 @@
if (file_exists($lcfilepath)) {
include($lcfilepath);
$localfileismissing = 0;
if (is_array($string)) {
if (isset($string) && is_array($string)) {
$lcstring = $string;
}
unset($string);
@ -519,9 +519,9 @@
unset($string);
include($enfilepath);
$enstring = $string;
$enstring = isset($string) ? $string : array();
//
// TODO/FIXME: IMHO following should not be here as the strings have moved into langconfig.php -- mudrd8mz
// Following strings have moved into langconfig.php, but keep the here for backward compatibility
//
if ($currentlang != 'en' and $currentfile == 'moodle.php') {
$enstring['thislanguage'] = "<< TRANSLATORS: Specify the name of your language here. If possible use Unicode Numeric Character References >>";