Change guid and link in RSS feeds to give original entry URL

Fix #1926

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
index 98f7194cfc82174e30079468caac8b8e600fab9b..6cabcf4495625c9cb21e5cd77446dcf46f298b7e 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
@@ -12,8 +12,8 @@
             <item>
                 <title><![CDATA[{{ entry.title }}]]></title>
                 <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
-                <link>{{ url('view', { 'id': entry.id }) }}</link>
-                <guid>{{ url('view', { 'id': entry.id }) }}</guid>
+                <link>{{ entry.url }}</link>
+                <guid>{{ entry.url }}</guid>
                 <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
                 <description>
                     <![CDATA[

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
index 98f7194cfc82174e30079468caac8b8e600fab9b..6cabcf4495625c9cb21e5cd77446dcf46f298b7e 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
@@ -12,8 +12,8 @@
             <item>
                 <title><![CDATA[{{ entry.title }}]]></title>
                 <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
-                <link>{{ url('view', { 'id': entry.id }) }}</link>
-                <guid>{{ url('view', { 'id': entry.id }) }}</guid>
+                <link>{{ entry.url }}</link>
+                <guid>{{ entry.url }}</guid>
                 <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
                 <description>
                     <![CDATA[