X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FFeedBuilder.php;h=73fafcbed31cb733ac0bf99611313d861a1b60a0;hb=1004742f09b55ff781c13745781b9a7e90986faa;hp=7377bcec09c3fa21b92434953661133b386e0829;hpb=ac94db1e36c77d52c316b5fa4e8e36b9d1e38b9e;p=github%2Fshaarli%2FShaarli.git diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php index 7377bcec..73fafcbe 100644 --- a/application/FeedBuilder.php +++ b/application/FeedBuilder.php @@ -148,11 +148,11 @@ class FeedBuilder $link['url'] = $pageaddr . $link['url']; } if ($this->usePermalinks === true) { - $permalink = 'Direct link'; + $permalink = ''. t('Direct link') .''; } else { - $permalink = 'Permalink'; + $permalink = ''. t('Permalink') .''; } - $link['description'] = format_description($link['description'], '', $pageaddr); + $link['description'] = format_description($link['description'], '', false, $pageaddr); $link['description'] .= PHP_EOL .'
— '. $permalink; $pubDate = $link['created']; @@ -163,7 +163,8 @@ class FeedBuilder $upDate = $link['updated']; $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM); } else { - $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM);; + $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM); + ; } // Save the more recent item. @@ -261,7 +262,6 @@ class FeedBuilder } if ($this->feedType == self::$FEED_RSS) { return $date->format(DateTime::RSS); - } return $date->format(DateTime::ATOM); }