* Encode link and guid urls in rss feeds to avoid illegal utf8 slipping in.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 71e71c02e4b4cb3aeccf2ec42247e9efa08dde96..4410a20176dd237dd830ebed769e747c4c5a3abb 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,6 +5,7 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki;
+use HTML::Entities q{encode_entities_numeric};
 
 sub import { #{{{
        IkiWiki::hook(type => "preprocess", id => "inline", 
@@ -162,7 +163,7 @@ sub genrss ($@) { #{{{
        my $page=shift;
        my @pages=@_;
        
-       my $url="$config{url}/".htmlpage($page);
+       my $url=encode_entities_numeric("$config{url}/".htmlpage($page));
        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1, 
                die_on_bad_params => 0);
@@ -170,10 +171,12 @@ sub genrss ($@) { #{{{
        foreach my $p (@pages) {
                next unless exists $renderedfiles{$p};
 
+               my $u=encode_entities_numeric("$config{url}/$renderedfiles{$p}");
+
                $itemtemplate->param(
                        title => pagetitle(basename($p)),
-                       url => "$config{url}/$renderedfiles{$p}",
-                       permalink => "$config{url}/$renderedfiles{$p}",
+                       url => $u,
+                       permalink => $u,
                        pubdate => date_822($pagectime{$p}),
                        content => absolute_urls(get_inline_content($p, $page), $url),
                );

diff --git a/debian/changelog b/debian/changelog
index 2f5f2afd1506b086f8d0906bef0964c842965e0b..7721dd374ef1dcceb310fba722aa484c511b5cab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ ikiwiki (1.16) UNRELEASED; urgency=low
   * Add permalink and author support to meta plugin, affecting RSS feeds
     and blog pages.
   * Various CSS and formatting changes.
+  * Encode link and guid urls in rss feeds to avoid illegal utf8 slipping in.
 
- -- Joey Hess <joeyh@debian.org>  Thu,  3 Aug 2006 18:45:36 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu,  3 Aug 2006 21:36:09 -0400
 
 ikiwiki (1.15) unstable; urgency=low