[Rt-commit] r18052 - in rt/3.999/branches/merge_to_3.8.2: .

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Jan 29 09:44:19 2009
New Revision: 18052

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ScrubHTML

Log:
 r19278 at sunnavys-mb:  sunnavy | 2009-01-29 22:28:28 +0800
 merged share/html/Elements/ScrubHTML


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ScrubHTML
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ScrubHTML	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ScrubHTML	Thu Jan 29 09:44:19 2009
@@ -59,11 +59,13 @@
         face   => 1,
         size   => 1,
         target => 1,
+        style  => qr{^(?:(?:color:\s*rgb\(\d+,\s*\d+,\s*\d+\))|
+                         (?:text-align:\s*))}ix,
     }
 );
 $scrubber->deny(qw[*]);
 $scrubber->allow(
-    qw[A B U P BR I HR BR SMALL EM FONT SPAN DIV UL OL LI DL DT DD PRE]
+    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>