diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 18:49:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 18:49:47 -0400 |
| commit | 2f33f294d95def3c50a467c5b5b9c5f5cae9e5fb (patch) | |
| tree | e73bc9f103ef227a232ab4bb5650a0cb190b25e0 | |
| parent | 973e49e31dac3fc3e6642acac126e4140429b205 (diff) | |
| parent | a64dca8356754a14ab9a4bcdd9d1a8bdba41d64b (diff) | |
Merge commit 'smcv/escape-feed-html'
| -rw-r--r-- | templates/atomitem.tmpl | 22 | ||||
| -rw-r--r-- | templates/atompage.tmpl | 14 | ||||
| -rw-r--r-- | templates/rssitem.tmpl | 2 |
3 files changed, 14 insertions, 24 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> diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl index e834d7693..dcb89ab5c 100644 --- a/templates/atompage.tmpl +++ b/templates/atompage.tmpl @@ -12,22 +12,18 @@ </TMPL_IF> </author> <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 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"> + <TMPL_VAR LICENSE ESCAPE=HTML> </rights> </TMPL_IF> </TMPL_IF> diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index 1144cd5e2..42936a668 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -21,6 +21,6 @@ <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> |