aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2016-10-16 20:52:35 +0200
committerArthurHoaro <arthur@hoa.ro>2016-11-05 14:30:13 +0100
commit7b004f3986457c9438f509fc318cccdbc5820951 (patch)
tree3242a2b9ba0a54acc968404e010cf97c321d9f26 /application
parent4e4479ddc561abaf3564359bdb663dd954c4215b (diff)
downloadShaarli-7b004f3986457c9438f509fc318cccdbc5820951.tar.gz
Shaarli-7b004f3986457c9438f509fc318cccdbc5820951.tar.zst
Shaarli-7b004f3986457c9438f509fc318cccdbc5820951.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')
-rw-r--r--application/FeedBuilder.php3
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;