From: Joey Hess Date: Thu, 12 Aug 2010 22:18:35 +0000 (-0400) Subject: Revert "insert flattr javascript via sanitize, not format hook" X-Git-Tag: 3.20100831~82 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=efd8e93c5be79b1df0b92b2b5aee91308e4343dc;p=ikiwiki.git Revert "insert flattr javascript via sanitize, not format hook" This reverts commit 3ef8864122c2e665d41ed4d45baa50d4a5d21873. Most aggregators block javascript and so it would display uglily. Need to find a way to fallback to static buttons instead. --- diff --git a/IkiWiki/Plugin/flattr.pm b/IkiWiki/Plugin/flattr.pm index 9cf9dfb13..3aee1eb93 100644 --- a/IkiWiki/Plugin/flattr.pm +++ b/IkiWiki/Plugin/flattr.pm @@ -8,7 +8,7 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "flattr", call => \&getsetup); hook(type => "preprocess", id => "flattr", call => \&preprocess); - hook(type => "sanitize", id => "flattr", call => \&sanitize, last => 1); + hook(type => "format", id => "flattr", call => \&format); } sub getsetup () { @@ -54,16 +54,17 @@ sub preprocess (@) { ''; } -sub sanitize (@) { +sub format (@) { my %params=@_; # Add flattr's javascript to pages with flattr buttons. if ($flattr_pages{$params{page}}) { - return flattrjs().$params{content}; - } - else { - return $params{content}; + if (! ($params{content}=~s!^(]*>)!$1.flattrjs()!em)) { + # no tag, probably in preview mode + $params{content}=flattrjs().$params{content}; + } } + return $params{content}; } my $js_cached;