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 /atompage.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 'atompage.tmpl')
| -rw-r--r-- | atompage.tmpl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/atompage.tmpl b/atompage.tmpl index 457d729..5be669e 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -12,22 +12,18 @@ </TMPL_IF> </author> <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 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"> + <TMPL_VAR LICENSE ESCAPE=HTML> </rights> </TMPL_IF> </TMPL_IF> |