[Rt-commit] rt branch, 4.0-trunk, updated. rt-3.9.7-1164-g6a34bd9

[Kevin Falcone]

The branch, 4.0-trunk has been updated
       via  6a34bd99526d4df5cf89b575d81a7e399c0e6ff1 (commit)
      from  87b6aeaf942eebd8c45ba97c7d64feb046b2da78 (commit)

Summary of changes:
 share/html/Elements/ShowUserVerbose |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 6a34bd99526d4df5cf89b575d81a7e399c0e6ff1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Dec 28 20:13:28 2010 -0500

    Actually display something when only passed a $Address
    (cherry picked from commit b9800dd7220ac1fd154025c1cd1aade1de800aaf)

diff --git a/share/html/Elements/ShowUserVerbose b/share/html/Elements/ShowUserVerbose
index e867c7c..80d9918 100644
--- a/share/html/Elements/ShowUserVerbose
+++ b/share/html/Elements/ShowUserVerbose
@@ -50,18 +50,20 @@
 <%INIT>
 my $phrase = '';
 my $address = '';
-my  $comment = '';
+my $comment = '';
 
 if ($User) {
     $address = $User->EmailAddress;
     $phrase  = $User->RealName if $User->RealName && lc $User->RealName ne lc $address;
     $comment = $User->Name if lc $User->Name ne lc $address;
+} else {
+    $address = $Address;
 }
 
 my $display = ($phrase || $comment || '' ) . ($address ?  ' <'.$address.'>' : '');
 
-   $display = $m->interp->apply_escapes( $display, 'h' )
-        unless $ARGS{'NoEscape'};
+$display = $m->interp->apply_escapes( $display, 'h' )
+    unless $ARGS{'NoEscape'};
 </%INIT>
 <%ARGS>
 $User => undef

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