From 9db90898be134c9f70c0b334ec071223e60ed76c Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 16 Apr 2006 18:02:31 +0000
Subject: Merge from 3.0 branch till 924

---
 framework/Web/UI/TTemplateManager.php        | 2 +-
 framework/Web/UI/WebControls/TDatePicker.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 488a3a3b..6b7202f7 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -105,7 +105,7 @@ class TTemplateManager extends TModule
 	 */
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app=$this->getApplication()->getGlobalization())===null)
+		if(($app=$this->getApplication()->getGlobalization(false))===null)
 			return $filename;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 9bb352d6..c6a2345b 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -406,7 +406,7 @@ class TDatePicker extends TTextBox
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization();
+		$app = $this->getApplication()->getGlobalization(false);
 		return $this->getCulture() == '' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
-- 
cgit v1.2.3