Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / templates / rssitem.tmpl

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 4e202026910005ce740c889b0555961a29ad3a34..42936a668f591bf7cf1a9a23fae4e076e3e48988 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -5,8 +5,8 @@
        <TMPL_ELSE>
        <title><TMPL_VAR TITLE></title>
        </TMPL_IF>
        <TMPL_ELSE>
        <title><TMPL_VAR TITLE></title>
        </TMPL_IF>

-       <TMPL_IF NAME="UUID">
-         <guid isPermaLink="no"><TMPL_VAR UUID></guid>
+       <TMPL_IF NAME="GUID">
+         <guid isPermaLink="no"><TMPL_VAR GUID></guid>

        <TMPL_ELSE>
          <guid><TMPL_VAR URL></guid>
        </TMPL_IF>
        <TMPL_ELSE>
          <guid><TMPL_VAR URL></guid>
        </TMPL_IF>


@@ -21,6 +21,6 @@
        <TMPL_IF NAME="ENCLOSURE">
        <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
        <TMPL_ELSE>
        <TMPL_IF NAME="ENCLOSURE">
        <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
        <TMPL_ELSE>

-       <description><![CDATA[<TMPL_VAR CONTENT>]]></description>
+       <description><TMPL_VAR CONTENT ESCAPE=HTML></description>

        </TMPL_IF>
 </item>
        </TMPL_IF>
 </item>