Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
	httemplate/misc/process/cancel_pkg.html

1 files changed, 3 insertions, 4 deletions

diff --git a/rt/share/html/Elements/CollectionAsTable/Row b/rt/share/html/Elements/CollectionAsTable/Row
index 9037e5d11..f91520952 100644
--- a/rt/share/html/Elements/CollectionAsTable/Row
+++ b/rt/share/html/Elements/CollectionAsTable/Row
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -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;
@@ -131,7 +130,7 @@ foreach my $column (@Format) {
             Arguments => [$record, $i],
         );
     }
-    s/\n/<br \/>/gs for grep { defined } @out;
+    s/\n/<br \/>/gs for grep defined $_, @out;
 
     $m->out( $_ .'="'. $m->interp->apply_escapes( $attrs{$_} => 'h' ) .'"' )
         foreach grep $attrs{$_}, qw(align style colspan);