X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/790a339db18f1c697052446728641c9e6ef06bdb..e823518f4247773ca31400e26e1204dcbdba4e6e:/IkiWiki/Plugin/htmlscrubber.pm

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 505a6f142..a58a27d52 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -32,7 +32,7 @@ sub import {
 	);
 	# data is a special case. Allow a few data:image/ types,
 	# but disallow data:text/javascript and everything else.
-	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i;
+	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?#]))|^#/i;
 }
 
 sub getsetup () {
@@ -57,8 +57,8 @@ sub sanitize (@) {
 
 	if (exists $config{htmlscrubber_skip} &&
 	    length $config{htmlscrubber_skip} &&
-	    exists $params{destpage} &&
-	    pagespec_match($params{destpage}, $config{htmlscrubber_skip})) {
+	    exists $params{page} &&
+	    pagespec_match($params{page}, $config{htmlscrubber_skip})) {
 		return $params{content};
 	}
 
@@ -107,7 +107,7 @@ sub scrubber {
 				placeholder min max step low high optimum
 				form required autocomplete novalidate pattern
 				list formenctype formmethod formnovalidate
-				formtarget reversed spellcheck open
+				formtarget reversed spellcheck open hidden
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,