From: Joey Hess <joey@kodama.kitenet.net> Date: Sun, 10 Feb 2008 19:58:17 +0000 (-0500) Subject: remove conflict marker X-Git-Tag: 1.33.4~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fc96e5a2a4ee1301a7ca4636479261d707c84c8;p=ikiwiki.git remove conflict marker --- diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn index 144594659..0b834779f 100644 --- a/doc/plugins/htmlscrubber.mdwn +++ b/doc/plugins/htmlscrubber.mdwn @@ -29,14 +29,8 @@ browser. Some examples of embedded javascript that won't be let through when this plugin is active: -<<<<<<< HEAD:doc/plugins/htmlscrubber.mdwn -* <span style="background: url(javascript:window.location='http://example.org/')">test</span> -* <span style="any: expression(window.location='http://example.org/')">test</span> -* <span style="any: expression(window.location='http://example.org/')">test</span> -======= * script tag test <script>window.location='http://example.org';</script> * <span style="background: url(javascript:window.location='http://example.org/')">CSS script test</span> * <span style="any: expression(window.location='http://example.org/')">entity-encoded CSS script test</span> * <span style="any: expression(window.location='http://example.org/')">entity-encoded CSS script test</span> * <a href="javascript:alert('foo')">click me</a> ->>>>>>> d7e0c03... * htmlscrubber security fix: Block javascript in uris.:doc/plugins/htmlscrubber.mdwn