additional safety checks

This commit is contained in:
AndreasErgenzinger 2013-04-17 10:41:07 +02:00
parent 7611d218df
commit eef1cf529e

View File

@ -132,7 +132,9 @@ class OC_L10N{
$transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
if (file_exists($transFile)) {
include $transFile;
$this->translations = array_merge($this->translations, $TRANSLATIONS);
if (isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
$this->translations = array_merge($this->translations, $TRANSLATIONS);
}
}
}
}