aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--application/FeedBuilder.php3
-rw-r--r--tests/FeedBuilderTest.php1
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60af7223..72914076 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
25- Plugins: 25- Plugins:
26 - Tools: only display parameter description when it exists 26 - Tools: only display parameter description when it exists
27 - archive.org: do not propose archival of private notes 27 - archive.org: do not propose archival of private notes
28- Use absolute URL for hashtags in RSS and ATOM feeds
28 29
29### Security 30### Security
30- Allow whitelisting trusted IPs, else continue banning clients upon login failure 31- Allow whitelisting trusted IPs, else continue banning clients upon login failure
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index c6657fbb..4036a7cc 100644
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -153,7 +153,8 @@ class FeedBuilder
153 } else { 153 } else {
154 $permalink = '<a href="'. $link['guid'] .'" title="Permalink">Permalink</a>'; 154 $permalink = '<a href="'. $link['guid'] .'" title="Permalink">Permalink</a>';
155 } 155 }
156 $link['description'] = format_description($link['description']) . PHP_EOL .'<br>&#8212; '. $permalink; 156 $link['description'] = format_description($link['description'], '', $pageaddr);
157 $link['description'] .= PHP_EOL .'<br>&#8212; '. $permalink;
157 158
158 $pubDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); 159 $pubDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
159 $link['pub_iso_date'] = $this->getIsoDate($pubDate); 160 $link['pub_iso_date'] = $this->getIsoDate($pubDate);
diff --git a/tests/FeedBuilderTest.php b/tests/FeedBuilderTest.php
index aa57f44e..d7839402 100644
--- a/tests/FeedBuilderTest.php
+++ b/tests/FeedBuilderTest.php
@@ -249,5 +249,6 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
249 $link = array_shift($data['links']); 249 $link = array_shift($data['links']);
250 $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['guid']); 250 $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['guid']);
251 $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['url']); 251 $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['url']);
252 $this->assertContains('http://host.tld:8080/~user/shaarli/?addtag=hashtag', $link['description']);
252 } 253 }
253} 254}