From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Fri, 15 Apr 2016 14:07:34 +0000 (+0200)
Subject: Change guid and link in RSS feeds to give original entry URL
X-Git-Tag: 2.0.2~11^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=2d899e8d307fba87b5fb625186e91ab90520a9a8;p=github%2Fwallabag%2Fwallabag.git

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 98f7194c..6cabcf44 100644
--- 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 98f7194c..6cabcf44 100644
--- 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[