additional safety checks
This commit is contained in:
parent
7611d218df
commit
eef1cf529e
|
@ -132,11 +132,13 @@ class OC_L10N{
|
||||||
$transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
|
$transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
|
||||||
if (file_exists($transFile)) {
|
if (file_exists($transFile)) {
|
||||||
include $transFile;
|
include $transFile;
|
||||||
|
if (isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
|
||||||
$this->translations = array_merge($this->translations, $TRANSLATIONS);
|
$this->translations = array_merge($this->translations, $TRANSLATIONS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) {
|
if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) {
|
||||||
// Include the file, save the data from $CONFIG
|
// Include the file, save the data from $CONFIG
|
||||||
|
|
Loading…
Reference in New Issue