From: Joey Hess Date: Sat, 1 Mar 2008 03:47:26 +0000 (-0500) Subject: Merge branch 'master' of git://git.madduck.net/code/ikiwiki X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/279db7860dc98bedbd8333bb7de57251dcfb223d?hp=eb13d46e212d893a68a6a3739a421e3e24ed7c1b Merge branch 'master' of git://git.madduck.net/code/ikiwiki --- diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 7ce07ee9a..3bdaccea1 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -31,7 +31,7 @@ sub import { #{{{ ); # data is a special case. Allow data:image/*, but # disallow data:text/javascript and everything else. - $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+$)/i; + $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+(?:$|\/))/i; } # }}} sub sanitize (@) { #{{{