Keep up with master changes

[github/shaarli/Shaarli.git] / tpl / default / feed.rss.html

diff --git a/tpl/default/feed.rss.html b/tpl/default/feed.rss.html
index 26de7f19136f4d3f9b4bdc061377319d374bb5d0..66d9a8697b1ca9647305559c2da34f4a64d5ca14 100644 (file)
--- a/tpl/default/feed.rss.html
+++ b/tpl/default/feed.rss.html
@@ -8,11 +8,10 @@
     <copyright>{$index_url}</copyright>
     <generator>Shaarli</generator>
     <atom:link rel="self" href="{$self_link}"  />
-    {if="!empty($pubsubhub_url)"}
-      <!-- PubSubHubbub Discovery -->
-      <atom:link rel="hub" href="{$pubsubhub_url}" />
-    {/if}
-    {loop="links"}
+    {loop="$plugins_feed_header"}
+      {$value}
+    {/loop}
+    {loop="$links"}
       <item>
         <title>{$value.title}</title>
         <guid isPermaLink="{if="$usepermalinks"}true{else}false{/if}">{$value.guid}</guid>
@@ -22,12 +21,16 @@
           <link>{$value.url}</link>
         {/if}
         {if="$show_dates"}
-          <pubDate>{$value.iso_date}</pubDate>
+          <pubDate>{$value.pub_iso_date}</pubDate>
+          <atom:modified>{$value.up_iso_date}</atom:modified>
         {/if}
         <description><![CDATA[{$value.description}]]></description>
         {loop="$value.taglist"}
           <category domain="{$index_url}?searchtags=">{$value}</category>
         {/loop}
+        {loop="$value.feed_plugins"}
+          {$value}
+        {/loop}
       </item>
     {/loop}
   </channel>