From 8a78c65c310980366481dce2c6db9db98109b229 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 31 May 2007 20:45:07 +0000 Subject: [PATCH] web commit by http://ccshan.myopenid.com/ --- .../meta_plugin_should_not_escape_title.mdwn | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 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 new file mode 100644 index 000000000..0edc4db6c --- /dev/null +++ b/doc/patchqueue/meta_plugin_should_not_escape_title.mdwn @@ -0,0 +1,115 @@ +The meta plugin escapes the overridden title of a page, which makes the title doubly escaped in RSS feeds. +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 @@ + -

+ +

-- 2.39.5