summaryrefslogtreecommitdiffstats
path: root/lib/l10n.php
diff options
context:
space:
mode:
authorAndreasErgenzinger <andreas.ergenzinger@gmx.de>2013-04-17 10:41:07 +0200
committerAndreasErgenzinger <andreas.ergenzinger@gmx.de>2013-04-17 10:41:07 +0200
commiteef1cf529ed03754798a2329fd29824be44cecda (patch)
treec59d85631d517aa0ebd049c97803c970f1b31b78 /lib/l10n.php
parent7611d218dfd4a8c1e8a36e9032c68a586c55b5df (diff)
downloadnextcloud-server-eef1cf529ed03754798a2329fd29824be44cecda.tar.gz
nextcloud-server-eef1cf529ed03754798a2329fd29824be44cecda.zip
additional safety checks
Diffstat (limited to 'lib/l10n.php')
-rw-r--r--lib/l10n.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/l10n.php b/lib/l10n.php
index 7b81d51b5e2..d35ce5fed14 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);
+ }
}
}
}