diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-07-08 22:45:58 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-07-08 22:45:58 -0700 |
| commit | a6fe07e49e3fc12169e801b1ed6874c3a5bd8500 (patch) | |
| tree | b87a7e6f37da5c8e13eb4d4653cfc8ce9239d8f0 /rt/share/html/Elements/ShowUserConcise | |
| parent | e27244386c346f459d1569db26344407a0372a05 (diff) | |
| parent | 005424d0c899aa899f43f583a6c74deb13ea4be1 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
httemplate/misc/process/cancel_pkg.html
Diffstat (limited to 'rt/share/html/Elements/ShowUserConcise')
| -rw-r--r-- | rt/share/html/Elements/ShowUserConcise | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/rt/share/html/Elements/ShowUserConcise b/rt/share/html/Elements/ShowUserConcise index d2cac1141..b56ba8372 100644 --- a/rt/share/html/Elements/ShowUserConcise +++ b/rt/share/html/Elements/ShowUserConcise @@ -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) @@ -46,7 +46,7 @@ %# %# END BPS TAGGED BLOCK }}} %# Released under the terms of version 2 of the GNU Public License -<% $Address || $User->RealName || $User->Name %>\ +<% $display |n %>\ <%ARGS> $User => undef $Address => undef @@ -61,4 +61,7 @@ if ( !$User && $Address ) { $Address = $Address->address; } } +my $display = $Address || $User->RealName || $User->Name; + $display = $m->interp->apply_escapes( $display, 'h' ) + unless $ARGS{'NoEscape'}; </%INIT> |