[libhtml-scrubber-perl] 09/13: treat * attr rule in the same way as any other

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to annotated tag release/0.10-TRIAL
in repository libhtml-scrubber-perl.

commit 6160ba35f51eb7acb4444b555ae9c24492b5acf3
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Sep 21 20:01:20 2013 +0400

    treat * attr rule in the same way as any other
    
    this means it can be regexp
---
 lib/HTML/Scrubber.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/HTML/Scrubber.pm b/lib/HTML/Scrubber.pm
index 5b8b93e..e02a3c9 100644
--- a/lib/HTML/Scrubber.pm
+++ b/lib/HTML/Scrubber.pm
@@ -367,13 +367,11 @@ sub _validate {
     my %f;
 
     for my $k( keys %$a ) {
-        if( exists $r->{$k} ) {
-            if( ref $r->{$k} || length($r->{$k}) > 1 ) {
-                $f{$k} = $a->{$k} if $a->{$k} =~ m{$r->{$k}};
-            } elsif( $r->{$k} ) {
-                $f{$k} = $a->{$k};
-            }
-        } elsif( exists $r->{'*'} and $r->{'*'} ) {
+        my $check = exists $r->{$k}? $r->{$k} : exists $r->{'*'}? $r->{'*'} : next;
+
+        if( ref $check || length($check) > 1 ) {
+            $f{$k} = $a->{$k} if $a->{$k} =~ m{$check};
+        } elsif( $check ) {
             $f{$k} = $a->{$k};
         }
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-scrubber-perl.git