From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 3 Feb 2009 20:04:36 +0000 (-0500)
Subject: Merge commit 'smcv/atom'
X-Git-Tag: 3.04~73
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b8b302cfa367f47d0c68d1f4e5fbf4f0b2aef25b?hp=aba2d83cc6c0273c30ae109b32c2ea404488116e

Merge commit 'smcv/atom'
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c667ee2a9..e1baae666 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -534,6 +534,11 @@ sub aggregate (@) {
 		}
 
 		foreach my $entry ($f->entries) {
+			# XML::Feed doesn't work around XML::Atom's bizarre
+			# API, so we will. Real unicode strings? Yes please.
+			# See [[bugs/Aggregated_Atom_feeds_are_double-encoded]]
+			local $XML::Atom::ForceUnicode = 1;
+
 			my $c=$entry->content;
 			# atom feeds may have no content, only a summary
 			if (! defined $c && ref $entry->summary) {