aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/3rdparty/libraries/feedwriter
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-04-24 18:05:16 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-04-24 18:05:16 +0200
commitd151b51c678127274ce76a05b28393961cfca9af (patch)
tree7731394584ea9667e11ffc988297b5f3d4209170 /inc/3rdparty/libraries/feedwriter
parentef17914960191c6008fc70891544ae2182d70582 (diff)
parent827f5b42a667a9ac2ab68701c23885ae6e617907 (diff)
downloadwallabag-d151b51c678127274ce76a05b28393961cfca9af.tar.gz
wallabag-d151b51c678127274ce76a05b28393961cfca9af.tar.zst
wallabag-d151b51c678127274ce76a05b28393961cfca9af.zip
Merge pull request #665 from mariroz/dev
fix of rss headers problem
Diffstat (limited to 'inc/3rdparty/libraries/feedwriter')
-rwxr-xr-xinc/3rdparty/libraries/feedwriter/FeedWriter.php23
1 files changed, 18 insertions, 5 deletions
diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
index 79639c0c..d708e99b 100755
--- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
@@ -87,12 +87,25 @@ define('JSONP', 3, true);
87 * @access public 87 * @access public
88 * @return void 88 * @return void
89 */ 89 */
90 public function genarateFeed() 90 public function genarateFeed($withHeaders = true)
91 { 91 {
92 header('Content-type: text/xml; charset=UTF-8'); 92 if ($withHeaders) {
93 // this line prevents Chrome 20 from prompting download 93 if ($this->version == RSS2) {
94 // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss 94 header('Content-type: text/xml; charset=UTF-8');
95 header('X-content-type-options: nosniff'); 95 // this line prevents Chrome 20 from prompting download
96 // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss
97 header('X-content-type-options: nosniff');
98 } elseif ($this->version == JSON) {
99 header('Content-type: application/json; charset=UTF-8');
100 } elseif ($this->version == JSONP) {
101 header('Content-type: application/javascript; charset=UTF-8');
102 }
103 }
104
105 if ($this->version == JSON || $this->version == JSONP) {
106 $this->json = new stdClass();
107 }
108
96 109
97 $this->printHead(); 110 $this->printHead();
98 $this->printChannels(); 111 $this->printChannels();