From 1cd5380675aab9a2884845b6630091be2e857f69 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 18 May 2006 21:26:25 +0000
Subject: Merge from 3.0 branch till 1082.

---
 framework/Collections/TList.php | 2 +-
 framework/Collections/TMap.php  | 5 -----
 framework/Web/THttpResponse.php | 8 +++++---
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'framework')

diff --git a/framework/Collections/TList.php b/framework/Collections/TList.php
index 244eab0f..5b27a02e 100644
--- a/framework/Collections/TList.php
+++ b/framework/Collections/TList.php
@@ -30,7 +30,7 @@
  * to determine the number of items in the list.
  *
  * To extend TList by doing additional operations with each addition or removal
- * operations, override {@link insertAt()}, and {@link removeAt()}.
+ * operation, override {@link insertAt()}, and {@link removeAt()}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @version $Revision: $  $Date: $
diff --git a/framework/Collections/TMap.php b/framework/Collections/TMap.php
index 85da4f3c..28508e1d 100644
--- a/framework/Collections/TMap.php
+++ b/framework/Collections/TMap.php
@@ -28,11 +28,6 @@
  * Note, count($map) will always return 1. You should use {@link getCount()}
  * to determine the number of items in the map.
  *
- * To extend TMap by doing additional operations with each added or removed item,
- * you can override {@link addedItem} and {@link removedItem}.
- * You can also override {@link canAddItem} and {@link canRemoveItem} to
- * control whether to add or remove a particular item.
- *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @version $Revision: $  $Date: $
  * @package System.Collections
diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index 582a3db3..5a3ff99d 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -65,7 +65,7 @@ class THttpResponse extends TModule implements ITextWriter
 	/**
 	 * @var string content type
 	 */
-	private $_contentType='text/html';
+	private $_contentType=null;
 	/**
 	 * @var string character set, e.g. UTF-8
 	 */
@@ -315,9 +315,11 @@ class THttpResponse extends TModule implements ITextWriter
 			$charset=$globalization->getCharset();
 		if($charset!=='')
 		{
-			$header='Content-Type: '.$this->getContentType().';charset='.$charset;
-			$this->appendHeader($header);
+			$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');
 	}
 
 	/**
-- 
cgit v1.2.3