Fix: return the proper value for the "self" feed attribute

[github/shaarli/Shaarli.git] / application / FeedBuilder.php

diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index 58c6bb179a636688a648bab720e43930306d5f1a..c6657fbb483215074a4bd5ce5cb57adf6a4276ff 100644 (file)
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -124,7 +124,8 @@ class FeedBuilder
         $data['last_update'] = $this->getLatestDateFormatted();
         $data['show_dates'] = !$this->hideDates || $this->isLoggedIn;
         // Remove leading slash from REQUEST_URI.
-        $data['self_link'] = $pageaddr . escape(ltrim($this->serverInfo['REQUEST_URI'], '/'));
+        $data['self_link'] = escape(server_url($this->serverInfo))
+                           . escape($this->serverInfo['REQUEST_URI']);
         $data['index_url'] = $pageaddr;
         $data['usepermalinks'] = $this->usePermalinks === true;
         $data['links'] = $linkDisplayed;