From bc1a7e1e3a67537189d30013ea6d5fa4bf98e8e4 Mon Sep 17 00:00:00 2001 From: xue <> Date: Sat, 19 Nov 2005 02:42:35 +0000 Subject: --- framework/Exceptions/TErrorHandler.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'framework/Exceptions/TErrorHandler.php') diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php index b5919e5d..52ed9935 100644 --- a/framework/Exceptions/TErrorHandler.php +++ b/framework/Exceptions/TErrorHandler.php @@ -92,9 +92,7 @@ class TErrorHandler extends TComponent implements IModule if($this->_templatePath===null) $this->_templatePath=dirname(__FILE__); $base=$this->_templatePath.'/'.self::ERROR_FILE_NAME; - $lang=array_shift(explode('-',array_shift(Prado::getUserLanguages()))); - if(!empty($lang) && !ctype_alpha($lang)) - $lang=''; + $lang=Prado::getPreferredLanguage(); if(is_file("$base$statusCode-$lang.html")) $errorFile="$base$statusCode-$lang.html"; else if(is_file("$base$statusCode.html")) @@ -175,9 +173,7 @@ class TErrorHandler extends TComponent implements IModule $_SERVER['SERVER_SOFTWARE'].' PRADO/'.Prado::getVersion(), strftime('%Y-%m-%d %H:%m',time()) ); - $lang=array_shift(explode('-',array_shift(Prado::getUserLanguages()))); - if(!empty($lang) && !ctype_alpha($lang)) - $lang=''; + $lang=Prado::getPreferredLanguage(); $exceptionFile=dirname(__FILE__).'/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html'; if(!is_file($exceptionFile)) $exceptionFile=dirname(__FILE__).'/'.self::EXCEPTION_FILE_NAME.'.html'; -- cgit v1.2.3