diff options
| author | Joey Hess <joey@kitenet.net> | 2007-11-27 16:36:37 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2007-11-27 16:36:37 -0500 |
| commit | c3805557f183a9ad628b58a06e64269a4982f6d6 (patch) | |
| tree | bf969ffc432acfb40dd187f18aae3edb66755ca3 | |
| parent | ce70d375a451eb11f257e310f834972d2e432e82 (diff) | |
* 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
| -rw-r--r-- | IkiWiki/Plugin/mdwn.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 |
3 files changed, 11 insertions, 4 deletions
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" |