aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-01-15 16:19:22 -0400
committerJoey Hess <joey@kitenet.net>2012-01-15 16:19:22 -0400
commitb38261a03aab649e3b194b7d1983536eee8a3684 (patch)
treee8bb17847c1c87e509613bdf27d111adfe58a53d
parent258412bd4368feecbd724ea88e7a98644c7fbec1 (diff)
downloadikiwiki-b38261a03aab649e3b194b7d1983536eee8a3684.tar
ikiwiki-b38261a03aab649e3b194b7d1983536eee8a3684.tar.gz
Workaround discount's eliding of <style> blocks.
-rw-r--r--IkiWiki/Plugin/mdwn.pm11
-rw-r--r--debian/changelog3
2 files changed, 11 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index b10d08517..338468e23 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -54,10 +54,17 @@ sub htmlize (@) {
eval q{use Text::Markdown::Discount};
if (! $@) {
$markdown_sub=sub {
+ my $t=shift;
# Workaround for discount binding bug
# https://rt.cpan.org/Ticket/Display.html?id=73657
- return "" if $_[0]=~/^\s*$/;
- Text::Markdown::Discount::markdown(@_);
+ return "" if $t=~/^\s*$/;
+ # Workaround for discount's eliding
+ # of <style> blocks.
+ # https://rt.cpan.org/Ticket/Display.html?id=74016
+ $t=~s/<style/<elyts/ig;
+ my $r=Text::Markdown::Discount::markdown($t);
+ $r=~s/<elyts/<style/ig;
+ return $r;
}
}
}
diff --git a/debian/changelog b/debian/changelog
index 142ca24ea..e60f87f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-ikiwiki (3.20120110) UNRELEASED; urgency=low
+ikiwiki (3.20120115) UNRELEASED; urgency=low
* Make backlink(.) work. Thanks, Giuseppe Bilotta.
+ * Workaround discount's eliding of <style> blocks.
-- Joey Hess <joeyh@debian.org> Fri, 13 Jan 2012 13:43:14 -0400