[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-313-g6ac8df1

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  6ac8df1d1cfe3597a112d88c04c9d39b155d810e (commit)
      from  ee5b13d1326fca5ebd2ac66ee457da0394be1267 (commit)

Summary of changes:
 share/html/Elements/ScrubHTML |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit 6ac8df1d1cfe3597a112d88c04c9d39b155d810e
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Apr 1 18:01:28 2010 +0400

    revert 'not scrubbing tables'
    
    We need code that filters unbalanced tags in the HTML. Until
    then this code stays on branch

diff --git a/share/html/Elements/ScrubHTML b/share/html/Elements/ScrubHTML
index ed166e9..7744a85 100644
--- a/share/html/Elements/ScrubHTML
+++ b/share/html/Elements/ScrubHTML
@@ -61,21 +61,12 @@ $scrubber->default(
         target => 1,
         style  => qr{^(?:(?:color:\s*rgb\(\d+,\s*\d+,\s*\d+\))|
                          (?:text-align:\s*))}ix,
-        colspan => qr{^[0-9]+$},
-        rowspan => qr{^[0-9]+$},
-        align   => qr{^(?i:left|center|right|justify|char)$},
-        valign  => qr{^(?i:top|middle|bottom|baseline)$},
     }
 );
 $scrubber->deny(qw[*]);
-$scrubber->allow(qw(
-    A EM P DIV SPAN PRE
-    HR BR
-    B U I SMALL FONT STRONG SUB SUP STRIKE
-    H1 H2 H3 H4 H5 H6
-    UL OL LI DL DT DD
-    TABLE TR TD TH
-) );
+$scrubber->allow(
+    qw[A B U P BR I HR BR SMALL EM FONT SPAN STRONG SUB SUP STRIKE H1 H2 H3 H4 H5 H6 DIV UL OL LI DL DT DD PRE]
+);
 $scrubber->comment(0);
 </%ONCE>
 <%init>

-----------------------------------------------------------------------