X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FFeedBuilder.php;h=b0aa5764e9329070f6399797ae1a3d24b846206c;hb=79a0dfe9cc658cbfafebac0aa9f1c2953faff777;hp=c6657fbb483215074a4bd5ce5cb57adf6a4276ff;hpb=c1c21028503f2c05206481b2b0cb7ac8d6c16a71;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index c6657fbb..b0aa5764 100644
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -153,14 +153,15 @@ class FeedBuilder
} else {
$permalink = 'Permalink';
}
- $link['description'] = format_description($link['description']) . PHP_EOL .'
— '. $permalink;
+ $link['description'] = format_description($link['description'], '', $pageaddr);
+ $link['description'] .= PHP_EOL .'
— '. $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);;