From 0892b27e326f14bd3f6229b55077ef5f9d5280b4 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 21 May 2011 18:14:36 +0000
Subject: branch/3.1: merged bugfixes from trunk/ up to current

---
 framework/I18N/TGlobalization.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'framework/I18N/TGlobalization.php')

diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php
index fd16f7bd..6e00dd48 100644
--- a/framework/I18N/TGlobalization.php
+++ b/framework/I18N/TGlobalization.php
@@ -149,7 +149,9 @@ class TGlobalization extends TModule
 	 */
 	public function getTranslationConfiguration()
 	{
-		return $this->_translation;
+		return ($this->getDefaultCulture() == $this->getCulture())
+			? null
+			: $this->_translation;
 	}
 
 	/**
-- 
cgit v1.2.3