[Rt-commit] rt branch, 4.2/user-info-formatting, updated. rt-4.1.6-301-g3118ad5

[Thomas Sibley]

The branch, 4.2/user-info-formatting has been updated
       via  3118ad5ac6233eaabe6a68a608c012fe405c41ad (commit)
      from  c49a64ff1a2ccfb814923c621940e64ad571e30a (commit)

Summary of changes:
 share/html/User/Elements/UserInfo | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 3118ad5ac6233eaabe6a68a608c012fe405c41ad
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Mar 5 16:14:03 2013 -0800

    Allow HTML in the user column titles
    
    The HTML doesn't need to be scrubbed since the format isn't
    user-adjustable.
    
    Before this commit, scrubbing the HTML was also moot since the Mason
    interpolation didn't turn off the default HTML escaping.

diff --git a/share/html/User/Elements/UserInfo b/share/html/User/Elements/UserInfo
index 37a53cb..dafadb3 100644
--- a/share/html/User/Elements/UserInfo
+++ b/share/html/User/Elements/UserInfo
@@ -50,11 +50,10 @@
 % my $title = $column->{title} || '';
 % my $attr = $column->{'attribute'} || $column->{'last_attribute'};
 % unless (defined $column->{title}) {
-%   $title = $fetch_columnmap->($attr,'title',[$attr],'no_escape');
+%   $title = $fetch_columnmap->($attr,'title',[$attr]);
 % }
-% $title = ScrubHTML($title);
 <div class="<% $ClassPrefix %>-extra-field <% CSSClass($fetch_columnmap->($attr,'attribute',[$attr],'no_escape')) %>" >
-<span class="label"><% loc($title) %></span>
+<span class="label"><% loc($title) |n %></span>
 % my @out;
 % foreach my $subcol ( @{ $column->{output} } ) {
 %     my ($col) = ($subcol =~ /^__(.*?)__$/);

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