X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8a78c65c310980366481dce2c6db9db98109b229..d7359b76cb626e199c37c2610ecf8980a0c81bc4:/doc/patchqueue/meta_plugin_should_not_escape_title.mdwn diff --git a/doc/patchqueue/meta_plugin_should_not_escape_title.mdwn b/doc/patchqueue/meta_plugin_should_not_escape_title.mdwn index 0edc4db6c..2cf8cf9b2 100644 --- a/doc/patchqueue/meta_plugin_should_not_escape_title.mdwn +++ b/doc/patchqueue/meta_plugin_should_not_escape_title.mdwn @@ -1,115 +1,11 @@ The meta plugin escapes the overridden title of a page, which makes the title doubly escaped in RSS feeds. + +> Er, didn't that already get fixed in svn? + +>> Right, sorry, I should have seen [[bugs/HTML-escaped_titles_in_Atom__44___RSS_feeds_don__39__t_validate]]. + Instead, the meta plugin should not escape the overridden title, but the templates should escape the title (overridden or not) whenever needed. - === perl/IkiWiki/Plugin/meta.pm - ================================================================== - --- perl/IkiWiki/Plugin/meta.pm (revision 6730) - +++ perl/IkiWiki/Plugin/meta.pm (revision 6731) - @@ -122,7 +122,7 @@ - $template->param(meta => $meta{$page}) - if exists $meta{$page} && $template->query(name => "meta"); - if (exists $title{$page} && $template->query(name => "title")) { - - $template->param(title => $title{$page}); - + $template->param(title => decode_entities($title{$page})); - $template->param(title_overridden => 1); - } - $template->param(permalink => $permalink{$page}) - === templates/recentchanges.tmpl - ================================================================== - --- templates/recentchanges.tmpl (revision 6730) - +++ templates/recentchanges.tmpl (revision 6731) - @@ -4,7 +4,7 @@ - - - - -<TMPL_VAR TITLE> - +<TMPL_VAR TITLE ESCAPE=HTML> - - - - @@ -15,7 +15,7 @@ - -
- - -/ - +/ - -
- - === templates/inlinepage.tmpl - ================================================================== - --- templates/inlinepage.tmpl (revision 6730) - +++ templates/inlinepage.tmpl (revision 6731) - @@ -10,9 +10,9 @@ -
- - - - - + - - - - + - - - - === templates/misc.tmpl - ================================================================== - --- templates/misc.tmpl (revision 6730) - +++ templates/misc.tmpl (revision 6731) - @@ -4,7 +4,7 @@ - - - - -<TMPL_VAR TITLE> - +<TMPL_VAR TITLE ESCAPE=HTML> - - - - @@ -15,7 +15,7 @@ - -
- - -/ - +/ - -
- - === templates/page.tmpl - ================================================================== - --- templates/page.tmpl (revision 6730) - +++ templates/page.tmpl (revision 6731) - @@ -3,7 +3,7 @@ - - - - -<TMPL_VAR TITLE> - +<TMPL_VAR TITLE ESCAPE=HTML> - - - - @@ -18,7 +18,7 @@ - - - / - - - + - - - - === templates/archivepage.tmpl - ================================================================== - --- templates/archivepage.tmpl (revision 6730) - +++ templates/archivepage.tmpl (revision 6731) - @@ -1,4 +1,4 @@ -

- - - - + -

- === templates/titlepage.tmpl - ================================================================== - --- templates/titlepage.tmpl (revision 6730) - +++ templates/titlepage.tmpl (revision 6731) - @@ -1 +1 @@ - -

- +

+> That doesn't work; now nonoverridden titles will be double escaped. And +> if you look at removing the code that escapes them the first time, things +> become complex.. --[[Joey]]