urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'smcv/escape-feed-html'

master
Joey Hess 2008-07-31 18:49:47 -04:00
parent 973e49e31d a64dca8356
commit 2f33f294d9
3 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
templates/atomitem.tmpl
View File

@ -10,22 +10,18 @@
<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="COPYRIGHT"> <TMPL_IF NAME="COPYRIGHT">
<rights type="xhtml" xml:lang="en"> <rights type="html" xml:lang="en">
<div xmlns="http://www.w3.org/1999/xhtml">
<TMPL_IF NAME="LICENSE"> <TMPL_IF NAME="LICENSE">
<TMPL_VAR LICENSE> <TMPL_VAR LICENSE ESCAPE=HTML>
<TMPL_VAR COPYRIGHT> <TMPL_VAR COPYRIGHT ESCAPE=HTML>
<TMPL_ELSE> <TMPL_ELSE>
<TMPL_VAR COPYRIGHT> <TMPL_VAR COPYRIGHT ESCAPE=HTML>
</TMPL_IF> </TMPL_IF>
</div>
</rights> </rights>
<TMPL_ELSE> <TMPL_ELSE>
<TMPL_IF NAME="LICENSE"> <TMPL_IF NAME="LICENSE">
<rights type="xhtml" xml:lang="en"> <rights type="html" xml:lang="en">
<div xmlns="http://www.w3.org/1999/xhtml"> <TMPL_VAR LICENSE ESCAPE=HTML>
<TMPL_VAR LICENSE>
</div>
</rights> </rights>
</TMPL_IF> </TMPL_IF>
</TMPL_IF> </TMPL_IF>
@ -39,10 +35,8 @@
<TMPL_IF NAME="ENCLOSURE"> <TMPL_IF NAME="ENCLOSURE">
<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
<TMPL_ELSE> <TMPL_ELSE>
<content type="xhtml" xml:lang="en"> <content type="html" xml:lang="en">
<div xmlns="http://www.w3.org/1999/xhtml"> <TMPL_VAR CONTENT ESCAPE=HTML>
<TMPL_VAR CONTENT>
</div>
</content> </content>
</TMPL_IF> </TMPL_IF>
</entry> </entry>

14
templates/atompage.tmpl
View File

@ -12,22 +12,18 @@
</TMPL_IF> </TMPL_IF>
</author> </author>
<TMPL_IF NAME="COPYRIGHT"> <TMPL_IF NAME="COPYRIGHT">
<rights type="xhtml" xml:lang="en"> <rights type="html" xml:lang="en">
<div xmlns="http://www.w3.org/1999/xhtml">
<TMPL_IF NAME="LICENSE"> <TMPL_IF NAME="LICENSE">
<TMPL_VAR LICENSE> <TMPL_VAR LICENSE>
<TMPL_VAR COPYRIGHT> <TMPL_VAR COPYRIGHT ESCAPE=HTML>
<TMPL_ELSE> <TMPL_ELSE>
<TMPL_VAR COPYRIGHT> <TMPL_VAR COPYRIGHT ESCAPE=HTML>
</TMPL_IF> </TMPL_IF>
</div>
</rights> </rights>
<TMPL_ELSE> <TMPL_ELSE>
<TMPL_IF NAME="LICENSE"> <TMPL_IF NAME="LICENSE">
<rights type="xhtml" xml:lang="en"> <rights type="html">
<div xmlns="http://www.w3.org/1999/xhtml"> <TMPL_VAR LICENSE ESCAPE=HTML>
<TMPL_VAR LICENSE>
</div>
</rights> </rights>
</TMPL_IF> </TMPL_IF>
</TMPL_IF> </TMPL_IF>

2
templates/rssitem.tmpl
View File

@ -21,6 +21,6 @@
<TMPL_IF NAME="ENCLOSURE"> <TMPL_IF NAME="ENCLOSURE">
<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" /> <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
<TMPL_ELSE> <TMPL_ELSE>
<description><![CDATA[<TMPL_VAR CONTENT>]]></description> <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
</TMPL_IF> </TMPL_IF>
</item> </item>