urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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
master
Joey Hess 2007-11-27 16:36:37 -05:00
parent ce70d375a4
commit c3805557f1
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/mdwn.pm
View File

@ -43,9 +43,11 @@ sub htmlize (@) { #{{{
# Workaround for perl bug (#376329) # Workaround for perl bug (#376329)
$content=Encode::encode_utf8($content); $content=Encode::encode_utf8($content);
$content=Encode::encode_utf8($content); eval {$content=&$markdown_sub($content)};
$content=&$markdown_sub($content); if ($@) {
$content=Encode::decode_utf8($content); eval {$content=&$markdown_sub($content)};
print STDERR $@ if $@;
}
$content=Encode::decode_utf8($content); $content=Encode::decode_utf8($content);
return $content; return $content;

5
debian/changelog vendored
View File

@ -5,6 +5,11 @@ ikiwiki (2.15) UNRELEASED; urgency=low
the setup process much simpler. the setup process much simpler.
* Reorganised git documentation. * Reorganised git documentation.
* Actually install the ikiwiki-update-wikilist program. * 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 -- Joey Hess <joeyh@debian.org> Tue, 27 Nov 2007 00:16:40 -0500

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"