X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FFeedBuilder.php;h=73fafcbed31cb733ac0bf99611313d861a1b60a0;hb=f211e417bf637b8a83988175c29ee072c69f7642;hp=a1f4da4810c0b25dceebb8d6698de93cf4eb81e9;hpb=fc11ab2f290a3712b766d78fdbcd354625a35d0a;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index a1f4da48..73fafcbe 100644
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -97,6 +97,11 @@ class FeedBuilder
*/
public function buildData()
{
+ // Search for untagged links
+ if (isset($this->userInput['searchtags']) && empty($this->userInput['searchtags'])) {
+ $this->userInput['searchtags'] = false;
+ }
+
// Optionally filter the results:
$linksToDisplay = $this->linkDB->filterSearch($this->userInput);
@@ -143,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'];
@@ -158,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.
@@ -256,7 +262,6 @@ class FeedBuilder
}
if ($this->feedType == self::$FEED_RSS) {
return $date->format(DateTime::RSS);
-
}
return $date->format(DateTime::ATOM);
}