diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-02 09:46:34 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-02 09:46:53 +0200 |
| commit | 0f3696a30b077a244ab337b924c73ae46034d88a (patch) | |
| tree | adc0d32fb326a2c91a5eddd09f24f2827d8a251c /atomitem.tmpl | |
| parent | 4fb9600af4d836e61a341531507380465b715226 (diff) | |
| parent | 03dddc72f595befbd6322dd32da6b4fcc3b2d1f1 (diff) | |
Merge branch 'master' into master-da
Conflicts (manually resolved):
atomitem.tmpl
atompage.tmpl
estseek.conf
Also dropped the following (changed earlier than 2.56 but missed):
estseek.conf
estseek.help
Diffstat (limited to 'atomitem.tmpl')
| -rw-r--r-- | atomitem.tmpl | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/atomitem.tmpl b/atomitem.tmpl index 146b9aa..b5edaa9 100644 --- a/atomitem.tmpl +++ b/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="da"> - <div xmlns="http://www.w3.org/1999/xhtml"> + <rights type="html" xml:lang="da"> <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="da"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR LICENSE> - </div> + <rights type="html" xml:lang="da"> + <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="da"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR CONTENT> - </div> + <content type="html" xml:lang="da"> + <TMPL_VAR CONTENT ESCAPE=HTML> </content> </TMPL_IF> </entry> |