diff options
author | VirtualTam <virtualtam@flibidi.net> | 2016-10-16 20:52:35 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2016-10-16 20:58:15 +0200 |
commit | 44a718090d716e53c0e78bf3a0225fd2fb30071e (patch) | |
tree | 5f3c1db9194133b96b4a4c977a064abc6e550e12 /application/FeedBuilder.php | |
parent | bb70e690598d270951148e003a4dc253b05868b4 (diff) | |
download | Shaarli-44a718090d716e53c0e78bf3a0225fd2fb30071e.tar.gz Shaarli-44a718090d716e53c0e78bf3a0225fd2fb30071e.tar.zst Shaarli-44a718090d716e53c0e78bf3a0225fd2fb30071e.zip |
Fix: return the proper value for the "self" feed attribute
Fixes https://github.com/shaarli/Shaarli/issues/629
Closes https://github.com/shaarli/Shaarli/pull/630
Note: you might need to empty the "pagecache" directory for the
fix to be taken into account
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'application/FeedBuilder.php')
-rw-r--r-- | application/FeedBuilder.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php index 58c6bb17..c6657fbb 100644 --- a/application/FeedBuilder.php +++ b/application/FeedBuilder.php | |||
@@ -124,7 +124,8 @@ class FeedBuilder | |||
124 | $data['last_update'] = $this->getLatestDateFormatted(); | 124 | $data['last_update'] = $this->getLatestDateFormatted(); |
125 | $data['show_dates'] = !$this->hideDates || $this->isLoggedIn; | 125 | $data['show_dates'] = !$this->hideDates || $this->isLoggedIn; |
126 | // Remove leading slash from REQUEST_URI. | 126 | // Remove leading slash from REQUEST_URI. |
127 | $data['self_link'] = $pageaddr . escape(ltrim($this->serverInfo['REQUEST_URI'], '/')); | 127 | $data['self_link'] = escape(server_url($this->serverInfo)) |
128 | . escape($this->serverInfo['REQUEST_URI']); | ||
128 | $data['index_url'] = $pageaddr; | 129 | $data['index_url'] = $pageaddr; |
129 | $data['usepermalinks'] = $this->usePermalinks === true; | 130 | $data['usepermalinks'] = $this->usePermalinks === true; |
130 | $data['links'] = $linkDisplayed; | 131 | $data['links'] = $linkDisplayed; |