[Rt-commit] rt branch, 4.0/remove-html-entities-dep, created. rt-4.0.4-44-g32b5701

[Thomas Sibley]

The branch, 4.0/remove-html-entities-dep has been created
        at  32b57018bdc5330d7fcb450deddb4f6227d16e2f (commit)

- Log -----------------------------------------------------------------
commit 32b57018bdc5330d7fcb450deddb4f6227d16e2f
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Nov 15 14:04:37 2011 -0500

    Remove our dependency on HTML::Entities
    
    The only code that used it now properly uses the standard Mason escaping
    routine we provide.

diff --git a/lib/RT/Interface/Web/Handler.pm b/lib/RT/Interface/Web/Handler.pm
index e7c8739..b5f9f53 100644
--- a/lib/RT/Interface/Web/Handler.pm
+++ b/lib/RT/Interface/Web/Handler.pm
@@ -56,7 +56,6 @@ use Text::Wrapper;
 use CGI::Cookie;
 use Time::ParseDate;
 use Time::HiRes;
-use HTML::Entities;
 use HTML::Scrubber;
 use RT::Interface::Web;
 use RT::Interface::Web::Request;
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index 04fe46e..758c4e7 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -185,7 +185,6 @@ DBIx::SearchBuilder 1.59
 Text::Template 1.44
 File::ShareDir
 File::Spec 0.8
-HTML::Entities 
 HTML::Quoted
 HTML::Scrubber 0.08
 Log::Dispatch 2.23
diff --git a/share/html/Elements/CollectionAsTable/Row b/share/html/Elements/CollectionAsTable/Row
index 0eed797..21a849d 100644
--- a/share/html/Elements/CollectionAsTable/Row
+++ b/share/html/Elements/CollectionAsTable/Row
@@ -60,7 +60,6 @@ $Classes => ''
 $m->out(  '<tr class="' . $Classes . ' '
         . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >'
         . "\n" );
-use HTML::Entities;
 my $item;
 foreach my $column (@Format) {
     if ( defined $column->{title} && $column->{title} eq 'NEWLINE' ) {
@@ -77,7 +76,7 @@ foreach my $column (@Format) {
         next;
     }
 
-    my $class = $column->{class} ? encode_entities( $column->{class}, q{'"&<>} ) : 'collection-as-table';
+    my $class = $column->{class} ? $m->interp->apply_escapes($column->{class}, 'h') : 'collection-as-table';
     $m->out(qq{<td class="$class" });
 
     my %attrs;

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