Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

1 files changed, 5 insertions, 12 deletions

diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
index df4c8b4b..79639c0c 100755
--- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
@@ -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();