From 3ec62cf95ab4436923d4c665fad7aef226cbb822 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 22 May 2014 17:16:38 +0300
Subject: update to 3.2 version of full-text-rss, issue #694

---
 inc/3rdparty/libraries/feedwriter/FeedWriter.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'inc/3rdparty/libraries/feedwriter/FeedWriter.php')

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)
-- 
cgit v1.2.3


From 3dc8d84229ed0f3ccd40b44420ed6e818a6edea9 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 29 May 2014 16:35:00 +0300
Subject: fix of uninitialized object warning, issue #710

---
 inc/3rdparty/libraries/feedwriter/FeedWriter.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'inc/3rdparty/libraries/feedwriter/FeedWriter.php')

diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
index 77755690..aa064afb 100755
--- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
@@ -97,13 +97,16 @@ 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();
         $this->printItems();
@@ -202,7 +205,7 @@ define('JSONP', 3, true);
     public function setDescription($description)
     {
         $tag = ($this->version == ATOM)? 'subtitle' : 'description';
-        $this->setChannelElement($tag, $desciption);
+        $this->setChannelElement($tag, $description);
     }
 
     /**
-- 
cgit v1.2.3


From 1d14e653156399ef4759df3c0f39cebc5ee0102e Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Sun, 1 Jun 2014 19:49:22 +0300
Subject: fix of undefined ATOM constant warning in full-text-rss, will fix
 ios-app issue #14

---
 inc/3rdparty/libraries/feedwriter/FeedWriter.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/3rdparty/libraries/feedwriter/FeedWriter.php')

diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
index aa064afb..9446cddf 100755
--- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
@@ -2,6 +2,7 @@
 define('RSS2', 1, true);
 define('JSON', 2, true);
 define('JSONP', 3, true);
+define('ATOM', 4, true);
 
  /**
  * Univarsel Feed Writer class
-- 
cgit v1.2.3