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/PradoBase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/PradoBase.php')

diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 08e503b1..7e631cb8 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -533,14 +533,14 @@ class PradoBase
 	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
 	{
 		Prado::using('System.I18N.Translation');
-		$app = Prado::getApplication()->getGlobalization();
+		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = array();
 		foreach($parameters as $key => $value)
 			$params['{'.$key.'}'] = $value;
 
 		//no translation handler provided
-		if(($config = $app->getTranslationConfiguration())===null)
+		if($app===null || ($config = $app->getTranslationConfiguration())===null)
 			return strtr($text, $params);
 
 		Translation::init();
-- 
cgit v1.2.3