From 42311f07396bf9aeff42debd875c49346ece1556 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 6 Aug 2008 17:38:06 +0000 Subject: [PATCH] In banners-by-size, make sure white-space around the height attribute is removed as well and replace two spaces with "\s" so we don't get fooled by tabs. Fixes #2036125. --- default.filter | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/default.filter b/default.filter index dbe77a80..0d6b8145 100644 --- a/default.filter +++ b/default.filter @@ -2,7 +2,7 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.65 2008/07/21 13:43:44 fabiankeil Exp $ +# $Id: default.filter,v 1.66 2008/08/03 17:27:47 fabiankeil Exp $ # # Purpose : Rules to process the content of web pages # @@ -219,12 +219,15 @@ s/\starget\s*=\s*(['"]?)_?(blank|new)\1?/ /ig # (X)HTML FILTER: img-reorder Reorder attributes in tags to make the banners-by-* filters more effective. # In the first step src is moved to the start, then width is moved to the second -# place to guarantee an order of src, width, height. +# place to guarantee an order of src, width, height. Also does some white-space +# normalization. +# # This makes banners-by-size more effective and allows both banners-by-size # and banners-by-link to preserve the original image URL in the title attribute. -s|]*) src\s*=\s*(['"])([^>\\\2]+)\2|]*) src\s*=\s*([^'">\\\s]+)|]*)\ssrc\s*=\s*(['"])([^>\\\2]+)\2|]*)\ssrc\s*=\s*([^'">\\\s]+)|]+height)\s*=\s*|$1=|sig s|\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5)(?=[\s>])|