aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/FeedBuilder.php
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2016-10-17 17:58:39 +0200
committerGitHub <noreply@github.com>2016-10-17 17:58:39 +0200
commit8406a4b670957b7d0450f6ea5e4f2e61c7114e8f (patch)
tree942421652643f6f340437939f76295f5d092afe1 /application/FeedBuilder.php
parent209aa96e7e32d810db30d2eb437cef2280c5cad6 (diff)
parent44a718090d716e53c0e78bf3a0225fd2fb30071e (diff)
downloadShaarli-8406a4b670957b7d0450f6ea5e4f2e61c7114e8f.tar.gz
Shaarli-8406a4b670957b7d0450f6ea5e4f2e61c7114e8f.tar.zst
Shaarli-8406a4b670957b7d0450f6ea5e4f2e61c7114e8f.zip
Merge pull request #662 from virtualtam/fix/feed/self-link
Fix: return the proper value for the "self" feed attribute
Diffstat (limited to 'application/FeedBuilder.php')
-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;