From 2983057ad91ccdef1fef86a85fe8e888350c3384 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 16 Apr 2006 14:43:51 +0000
Subject: Fixed a few issues with using Globalization.

---
 framework/Web/THttpResponse.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'framework/Web/THttpResponse.php')

diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index d4a62cc6..f76218ca 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -69,7 +69,7 @@ class THttpResponse extends TModule implements ITextWriter
 	/**
 	 * @var string character set, e.g. UTF-8
 	 */
-	private $_charset;
+	private $_charset='';
 
 	/**
 	 * Destructor.
@@ -285,10 +285,10 @@ class THttpResponse extends TModule implements ITextWriter
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$charset = $this->getCharset();
-		if(empty($charset) && ($globalization=$this->getApplication()->getGlobalization())!==null)
-			$charset = $globalization->getCharset();
-		if(!empty($charset))
+		$charset=$this->getCharset();
+		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
+			$charset=$globalization->getCharset();
+		if($charset==='')
 		{
 			$header='Content-Type: '.$this->getContentType().';charset='.$charset;
 			$this->appendHeader($header);
-- 
cgit v1.2.3