merge

[github/shaarli/Shaarli.git] / application / FeedBuilder.php

diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index c6657fbb483215074a4bd5ce5cb57adf6a4276ff..b0aa5764e9329070f6399797ae1a3d24b846206c 100644 (file)
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -153,14 +153,15 @@ class FeedBuilder
         } else {
             $permalink = '<a href="'. $link['guid'] .'" title="Permalink">Permalink</a>';
         }
-        $link['description'] = format_description($link['description']) . PHP_EOL .'<br>&#8212; '. $permalink;
+        $link['description']  = format_description($link['description'], '', $pageaddr);
+        $link['description'] .= PHP_EOL .'<br>&#8212; '. $permalink;
 
-        $pubDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
+        $pubDate = $link['created'];
         $link['pub_iso_date'] = $this->getIsoDate($pubDate);
 
         // atom:entry elements MUST contain exactly one atom:updated element.
         if (!empty($link['updated'])) {
-            $upDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['updated']);
+            $upDate = $link['updated'];
             $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM);
         } else {
             $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM);;