diff --git a/lib/l10n.php b/lib/l10n.php index 7b81d51b5e2e13074b6ceec0be6e4e71cb4d1310..d35ce5fed14f4b19b3007f9e8b71c919b6ef4780 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -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); + } } } }