additional safety checks

12 years ago · eef1cf529e
parent 7611d218df
commit eef1cf529e
1 changed files with 3 additions and 1 deletions
--- 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);
+							}
 						}
 					}
 				}