diff options
| author | wei <> | 2006-08-02 00:03:01 +0000 |
|---|---|---|
| committer | wei <> | 2006-08-02 00:03:01 +0000 |
| commit | 8ab3ff590bd67acf666c6f3e2c71032424dd93ce (patch) | |
| tree | be415fdcfbd14f331413b60e661db86feeddfd0f /framework/Web | |
| parent | f36d3d2f730b7f78189533553c10e439111a274d (diff) | |
Fixed sending default charset.
Diffstat (limited to 'framework/Web')
| -rw-r--r-- | framework/Web/THttpResponse.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php index b6b675c1..99d8daa5 100644 --- a/framework/Web/THttpResponse.php +++ b/framework/Web/THttpResponse.php @@ -314,15 +314,14 @@ class THttpResponse extends TModule implements ITextWriter protected function sendContentTypeHeader()
{
$charset=$this->getCharset();
- if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
+ if(empty($charset) && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
$charset=$globalization->getCharset();
- if($charset!=='')
- {
- $contentType=$this->_contentType===null?'text/html':$this->_contentType;
- $this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
- }
- else if($this->_contentType!==null)
- $this->appendHeader('Content-Type: '.$this->_contentType.';charset=UTF-8');
+
+ $contentType=empty($this->_contentType)?'text/html':$this->_contentType;
+ $charset=empty($charset)?'UTF-8':$charset;
+
+ //default is "Content-Type: text/html;charset=UTF-8"
+ $this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
}
/**
|