diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-28 19:43:28 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-28 19:43:28 +0000 |
| commit | ba1765fbdfeb0fd1fdf1354c1688580ef7864b68 (patch) | |
| tree | ca178c0c9343617e4b85879fb8ca91bd6a77605a /templates | |
| parent | 8fc13829491c4a3ec3d8e174fd96687e111da251 (diff) | |
| download | ikiwiki-ba1765fbdfeb0fd1fdf1354c1688580ef7864b68.tar ikiwiki-ba1765fbdfeb0fd1fdf1354c1688580ef7864b68.tar.gz | |
* More consistent encoding of titles in rss and atom feeds. Don't use
ESCAPE=HTML for titles in the templates for these feeds, and instead
escape the title going in to the template. Previously, the title was
sometimes double-escaped in a feed (if set via meta title), and sometimes
not (if set from the page filename).
* In the meta plugin, when a title is set, encode the html entities in it
numerically. This works better in the current landscape of a rss spec that
doesn't specify encoding, and variously broken feed consumers, according
to <http://www.rssboard.org/rss-profile#data-types-characterdata>.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/atomitem.tmpl | 2 | ||||
| -rw-r--r-- | templates/atompage.tmpl | 2 | ||||
| -rw-r--r-- | templates/rssitem.tmpl | 4 | ||||
| -rw-r--r-- | templates/rsspage.tmpl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl index bdbfe69c7..9190fcc84 100644 --- a/templates/atomitem.tmpl +++ b/templates/atomitem.tmpl @@ -1,5 +1,5 @@ <entry> - <title><TMPL_VAR TITLE ESCAPE=HTML></title> + <title><TMPL_VAR TITLE></title> <TMPL_IF NAME="AUTHOR"> <author><TMPL_VAR AUTHOR ESCAPE=HTML></author> <TMPL_ELSE> diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl index b811b8764..1bca3e7f8 100644 --- a/templates/atompage.tmpl +++ b/templates/atompage.tmpl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> -<title><TMPL_VAR TITLE ESCAPE=HTML></title> +<title><TMPL_VAR TITLE></title> <link href="<TMPL_VAR PAGEURL>"/> <link href="<TMPL_VAR FEEDURL>" rel="self"/> <author> diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index 0fab42e71..c243b74b3 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -1,9 +1,9 @@ <item> <TMPL_IF NAME="AUTHOR"> - <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE ESCAPE=HTML></title> + <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title> <dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator> <TMPL_ELSE> - <title><TMPL_VAR TITLE ESCAPE=HTML></title> + <title><TMPL_VAR TITLE></title> </TMPL_IF> <guid><TMPL_VAR URL></guid> <link><TMPL_VAR PERMALINK></link> diff --git a/templates/rsspage.tmpl b/templates/rsspage.tmpl index 38f9b16b3..34c1a33ce 100644 --- a/templates/rsspage.tmpl +++ b/templates/rsspage.tmpl @@ -1,7 +1,7 @@ <?xml version="1.0"?> <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/"> <channel> -<title><TMPL_VAR TITLE ESCAPE=HTML></title> +<title><TMPL_VAR TITLE></title> <link><TMPL_VAR PAGEURL></link> <description><TMPL_VAR FEEDDESC ESCAPE=HTML></description> <TMPL_VAR CONTENT> |