Merge pull request #643 from wallabag/fix-636

[fix] rss feed content type set to text/xml #636
This commit is contained in:
Nicolas Lœuillet 2014-04-15 21:49:37 +02:00
commit bfe1ad6dbc
1 changed files with 5 additions and 12 deletions

View File

@ -89,18 +89,11 @@ define('JSONP', 3, true);
*/
public function genarateFeed()
{
if ($this->version == RSS2) {
// header('Content-type: text/xml; charset=UTF-8');
// this line prevents Chrome 20 from prompting download
// used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
// header('X-content-type-options: nosniff');
} elseif ($this->version == JSON) {
// header('Content-type: application/json; charset=UTF-8');
$this->json = new stdClass();
} elseif ($this->version == JSONP) {
// header('Content-type: application/javascript; charset=UTF-8');
$this->json = new stdClass();
}
header('Content-type: text/xml; charset=UTF-8');
// this line prevents Chrome 20 from prompting download
// used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
header('X-content-type-options: nosniff');
$this->printHead();
$this->printChannels();
$this->printItems();