Merge pull request #707 from mariroz/dev

update to 3.2 version of full-text-rss, issue #694

1 files changed, 10 insertions, 7 deletions

diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
index d708e99b..77755690 100755
--- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
@@ -97,15 +97,12 @@ define('JSONP', 3, true);
               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();

           }

         }

-      

-        if ($this->version == JSON || $this->version == JSONP) {

-          $this->json = new stdClass();

-        }

-      

 

         $this->printHead();

         $this->printChannels();

@@ -116,6 +113,11 @@ define('JSONP', 3, true);
         }

     }

 

+    public function &getItems()

+    {

+        return $this->items;

+    }

+

     /**

     * Create a new FeedItem.

     *

@@ -199,7 +201,8 @@ define('JSONP', 3, true);
     */

     public function setDescription($description)

     {

-        $this->setChannelElement('description', $description);

+        $tag = ($this->version == ATOM)? 'subtitle' : 'description';

+        $this->setChannelElement($tag, $desciption);

     }

 

     /**

@@ -244,7 +247,7 @@ define('JSONP', 3, true);
         {

             $out  = '<?xml version="1.0" encoding="utf-8"?>'."\n";

             if ($this->xsl) $out .= '<?xml-stylesheet type="text/xsl" href="'.htmlspecialchars($this->xsl).'"?>' . PHP_EOL;

-            $out .= '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">' . PHP_EOL;

+            $out .= '<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">' . PHP_EOL;

             echo $out;

         }

         elseif ($this->version == JSON || $this->version == JSONP)