From eef1cf529ed03754798a2329fd29824be44cecda Mon Sep 17 00:00:00 2001
From: AndreasErgenzinger <andreas.ergenzinger@gmx.de>
Date: Wed, 17 Apr 2013 10:41:07 +0200
Subject: [PATCH] additional safety checks
---
lib/l10n.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/l10n.php b/lib/l10n.php
index 7b81d51b5e..d35ce5fed1 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);
+ }
}
}
}
--
GitLab