From f87b64cffde60dba04f5ed46dfad6be133f9ee3f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 12 Jul 2008 15:49:09 +0000 Subject: [PATCH] - Don't let img-reorder touch width attributes that aren't followed by either whitespace or '>', as those usually indicate onclick nonsense. Problem and solution reported by Glenn Washburn in #2014552. - While at it, don't use more groups than necessary. --- default.filter | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/default.filter b/default.filter index 0d4e06ba..2a791f3d 100644 --- a/default.filter +++ b/default.filter @@ -2,7 +2,7 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.62 2008/06/21 17:02:03 fabiankeil Exp $ +# $Id: default.filter,v 1.63 2008/06/27 12:53:41 fabiankeil Exp $ # # Purpose : Rules to process the content of web pages # @@ -226,7 +226,7 @@ FILTER: img-reorder Reorder attributes in tags to make the banners-by-* fi s|]*) src\s*=\s*(['"])([^>\\\2]+)\2|]*) src\s*=\s*([^'">\\\s]+)|\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*(["']?)(\d+?)\4|\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5[\s>])|