moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 11:22:17 -05:00
Code Issues Releases Wiki Activity

Merge pull request #643 from wallabag/fix-636

Browse Source 
[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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
inc/3rdparty/libraries/feedwriter/FeedWriter.php vendored
View File

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