From c0d0631c3b3c528ad0be4dba83fa37d2d337a4cc Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 15 Oct 2010 01:16:31 +0000
Subject: [PATCH] BUGFIX: catch case of plugin not returning translations for
 the locale (from r104847)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112399 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/i18n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/i18n.php b/core/i18n.php
index 69fbd32cc..337ad0447 100755
--- a/core/i18n.php
+++ b/core/i18n.php
@@ -1902,7 +1902,7 @@ class i18n extends Object {
 	 */
 	static function merge_locale_data($locale, $extra) {
 		global $lang;
-		if (!$extra || count($extra) == 0) return;
+		if (!$extra || count($extra) == 0 || !isset($extra[$locale])) return;
 		foreach ($extra[$locale] as $class => $entities) {
 			foreach ($entities as $entity => $translation) {
 				$lang[$locale][$class][$entity] = $translation;