diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2017-11-08 18:54:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 18:54:32 +0100 |
| commit | b14d34d2c7b7a7360adcc823472a43f64b579e1c (patch) | |
| tree | 3e9cf5757246945a499fdc45d45820021c04e2ce /application/FeedBuilder.php | |
| parent | e813f97b1af314e9391e6d4e734dc7cca5b0bc2c (diff) | |
| parent | fd08b50a80c3aed25f9e2a19cbfe9fb3ad35cf1f (diff) | |
| download | Shaarli-b14d34d2c7b7a7360adcc823472a43f64b579e1c.tar.gz Shaarli-b14d34d2c7b7a7360adcc823472a43f64b579e1c.tar.zst Shaarli-b14d34d2c7b7a7360adcc823472a43f64b579e1c.zip | |
Merge pull request #1012 from ArthurHoaro/hotfix/urlencode
Don't URL encode description links if parameter 'redirector.encode_url' is set to false
Diffstat (limited to 'application/FeedBuilder.php')
| -rw-r--r-- | application/FeedBuilder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php index 3cfaafb4..ebae18b4 100644 --- a/application/FeedBuilder.php +++ b/application/FeedBuilder.php | |||
| @@ -152,7 +152,7 @@ class FeedBuilder | |||
| 152 | } else { | 152 | } else { |
| 153 | $permalink = '<a href="'. $link['guid'] .'" title="'. t('Permalink') .'">'. t('Permalink') .'</a>'; | 153 | $permalink = '<a href="'. $link['guid'] .'" title="'. t('Permalink') .'">'. t('Permalink') .'</a>'; |
| 154 | } | 154 | } |
| 155 | $link['description'] = format_description($link['description'], '', $pageaddr); | 155 | $link['description'] = format_description($link['description'], '', false, $pageaddr); |
| 156 | $link['description'] .= PHP_EOL .'<br>— '. $permalink; | 156 | $link['description'] .= PHP_EOL .'<br>— '. $permalink; |
| 157 | 157 | ||
| 158 | $pubDate = $link['created']; | 158 | $pubDate = $link['created']; |