From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Nov 2007 21:36:37 +0000 (-0500)
Subject: * Improve workaround for perl bug #376329. Rather than double-encoding,
X-Git-Tag: 2.15~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c3805557f183a9ad628b58a06e64269a4982f6d6;p=ikiwiki.git

* Improve workaround for perl bug #376329. Rather than double-encoding,
  which has been reported to cause encoding problems (though I haven't
  reproduced them), just catch a failure of markdown, and retry.
  (The crazy perl bug magically disappears on the retry.)
  Closes: #449379
---

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index ca8898679..254ab51d0 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -43,9 +43,11 @@ sub htmlize (@) { #{{{
 	
 	# Workaround for perl bug (#376329)
 	$content=Encode::encode_utf8($content);
-	$content=Encode::encode_utf8($content);
-	$content=&$markdown_sub($content);
-	$content=Encode::decode_utf8($content);
+	eval {$content=&$markdown_sub($content)};
+	if ($@) {
+		eval {$content=&$markdown_sub($content)};
+		print STDERR $@ if $@;
+	}
 	$content=Encode::decode_utf8($content);
 
 	return $content;
diff --git a/debian/changelog b/debian/changelog
index 2a9aae3ab..fe93e036c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ ikiwiki (2.15) UNRELEASED; urgency=low
     the setup process much simpler.
   * Reorganised git documentation.
   * Actually install the ikiwiki-update-wikilist program.
+  * Improve workaround for perl bug #376329. Rather than double-encoding,
+    which has been reported to cause encoding problems (though I haven't
+    reproduced them), just catch a failure of markdown, and retry.
+    (The crazy perl bug magically disappears on the retry.)
+    Closes: #449379
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Nov 2007 00:16:40 -0500
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 9dd020f8c..277df7f21 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-26 15:27-0500\n"
+"POT-Creation-Date: 2007-11-27 16:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"