diff options
| author | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-31 22:12:56 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-31 22:12:56 +0100 |
| commit | 9bc2e316b2d96245a9904da4d484f918db39ed07 (patch) | |
| tree | 5d9c71ef90b960a56a0208600b578fba29bfffea /templates | |
| parent | 5e85039dc3a329a064a0d3053bbca2ed066f5292 (diff) | |
| download | ikiwiki-9bc2e316b2d96245a9904da4d484f918db39ed07.tar ikiwiki-9bc2e316b2d96245a9904da4d484f918db39ed07.tar.gz | |
Escape HTML in Atom feeds, rather than relying on it being well-formed XHTML with no named entity references
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/atomitem.tmpl | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl index 19c557f30..1ff7f4f4e 100644 --- a/templates/atomitem.tmpl +++ b/templates/atomitem.tmpl @@ -10,22 +10,18 @@ <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> </TMPL_IF> <TMPL_IF NAME="COPYRIGHT"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> + <rights type="html" xml:lang="en"> <TMPL_IF NAME="LICENSE"> - <TMPL_VAR LICENSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR LICENSE ESCAPE=HTML> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> <TMPL_ELSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> </TMPL_IF> - </div> </rights> <TMPL_ELSE> <TMPL_IF NAME="LICENSE"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR LICENSE> - </div> + <rights type="html" xml:lang="en"> + <TMPL_VAR LICENSE ESCAPE=HTML> </rights> </TMPL_IF> </TMPL_IF> @@ -39,10 +35,8 @@ <TMPL_IF NAME="ENCLOSURE"> <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> <TMPL_ELSE> - <content type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR CONTENT> - </div> + <content type="html" xml:lang="en"> + <TMPL_VAR CONTENT ESCAPE=HTML> </content> </TMPL_IF> </entry> |