From 879efac4a5198cb6ab71bb8a3d50771e6d687970 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 17 Jul 2007 17:27:20 +0000
Subject: updated UPGRADE instruction.

---
 framework/Web/Services/TFeedService.php | 34 +++++++++++----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

(limited to 'framework/Web/Services/TFeedService.php')

diff --git a/framework/Web/Services/TFeedService.php b/framework/Web/Services/TFeedService.php
index a40bcca9..af3b44bd 100644
--- a/framework/Web/Services/TFeedService.php
+++ b/framework/Web/Services/TFeedService.php
@@ -44,7 +44,6 @@
 class TFeedService extends TService
 {
 	private $_feeds=array();
-	private $_contentType='text/xml';
 
 	/**
 	 * Initializes this module.
@@ -93,7 +92,7 @@ class TFeedService extends TService
 
 					$content=$feed->getFeedContent();
 				    //$this->getResponse()->setContentType('application/rss+xml');
-				    $this->getResponse()->setContentType($this->getContentType());
+				    $this->getResponse()->setContentType($feed->getContentType());
 				    $this->getResponse()->write($content);
 				}
 				else
@@ -105,27 +104,6 @@ class TFeedService extends TService
 		else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);
 	}
-
-	/**
-	 * @return string the content type for the feed content. Defaults to 'text/xml'.
-	 */
-	public function getContentType()
-	{
-		return $this->_contentType;
-	}
-
-	/**
-	 * Sets the content type of the feed content to be sent.
-	 * Some examples are:
-	 * RSS 1.0 feed: application/rdf+xml
-	 * RSS 2.0 feed: application/rss+xml or application/xml or text/xml
-	 * ATOM feed: application/atom+xml
-	 * @param string the content type for the feed content.
-	 */
-	public function setContentType($type)
-	{
-		$this->_contentType=$type;
-	}
 }
 
 /**
@@ -153,6 +131,16 @@ interface IFeedContentProvider
 	 * @return string feed content in proper XML format
 	 */
 	public function getFeedContent();
+	/**
+	 * Sets the content type of the feed content to be sent.
+	 * Some examples are:
+	 * RSS 1.0 feed: application/rdf+xml
+	 * RSS 2.0 feed: application/rss+xml or application/xml or text/xml
+	 * ATOM feed: application/atom+xml
+	 * @return string the content type for the feed content.
+	 * @since 3.1.1
+	 */
+	public function getContentType();
 }
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.3