Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #665 from ArthurHoaro/fix/feed-hashtags

Browse source 
Fix hashtag links in Feeds
This commit is contained in:
VirtualTam 2016-10-20 21:37:28 +02:00 committed by GitHub
commit 954dc2446c
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Plugins: - Plugins:
- Tools: only display parameter description when it exists - Tools: only display parameter description when it exists
- archive.org: do not propose archival of private notes - archive.org: do not propose archival of private notes
- Use absolute URL for hashtags in RSS and ATOM feeds
### Security ### Security
- Allow whitelisting trusted IPs, else continue banning clients upon login failure - Allow whitelisting trusted IPs, else continue banning clients upon login failure

3
application/FeedBuilder.php
View file

@ -153,7 +153,8 @@ protected function buildItem($link, $pageaddr)
} else { } else {
$permalink = '<a href="'. $link['guid'] .'" title="Permalink">Permalink</a>'; $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 = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
$link['pub_iso_date'] = $this->getIsoDate($pubDate); $link['pub_iso_date'] = $this->getIsoDate($pubDate);

1
tests/FeedBuilderTest.php
View file

@ -249,5 +249,6 @@ public function testBuildDataServerSubdir()
$link = array_shift($data['links']); $link = array_shift($data['links']);
$this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['guid']); $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['guid']);
$this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['url']); $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['url']);
$this->assertContains('http://host.tld:8080/~user/shaarli/?addtag=hashtag', $link['description']);
} }
} }