[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-190-g7754204

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  77542044ef3d467b79a3a43acdb1a5412291dd67 (commit)
       via  5ed4d94924e24f3b605b38e4435c3b4617138d2c (commit)
      from  f7058ce2559998b27a72e3877a65569f5ae03f8d (commit)

Summary of changes:
 lib/RT/Interface/Web.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 5ed4d94924e24f3b605b38e4435c3b4617138d2c
Author: Christian Loos <cloos at netcologne.de>
Date:   Thu Mar 12 15:30:01 2015 +0100

    allow HTML5 <s> and <del> tags
    
    The <s> and <del> tags replaced in HTML5 the old <strike> tag.
    
    The <s> tag specifies text that is no longer correct, accurate or
    relevant.
    The <del> tag defines text that has been deleted from a document.
    
    We still need to support the <strike> tag as the current used CKEditor
    uses it. Newer versions of CKEditor use the <s> tag.

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index df7c876..126709f 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -3919,7 +3919,7 @@ following:
 =cut
 
 our @SCRUBBER_ALLOWED_TAGS = qw(
-    A B U P BR I HR BR SMALL EM FONT SPAN STRONG SUB SUP STRIKE H1 H2 H3 H4 H5
+    A B U P BR I HR BR SMALL EM FONT SPAN STRONG SUB SUP S DEL STRIKE H1 H2 H3 H4 H5
     H6 DIV UL OL LI DL DT DD PRE BLOCKQUOTE BDO
 );
 

commit 77542044ef3d467b79a3a43acdb1a5412291dd67
Merge: f7058ce 5ed4d94
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Mar 12 11:09:40 2015 -0400

    Merge branch '4.2/allow-html-s-and-del-tags' into 4.2-trunk


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