From b28a14b7fd9781f307fcf2dffe86800e338c3649 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sun, 16 Aug 2009 06:20:31 +0000
Subject: [PATCH] Fix broken, inconsistent friend wholeName. Bug 10782.

---
 docs/changelog/7.x.x.txt    | 1 +
 lib/WebGUI/Account/Inbox.pm | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8cf522a4d..bf4b158bb 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.7.18
+ - fixed #10782: Send Message friend_wholeName template var
  - fixed #10778: Matrix navigation: list attributes
  - fixed #10776: i18n AuthLDAP::7 description 
  - fixed #10775: i18n AuthLDAP::6 description
diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index a362cd1c4..0f16b6276 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -1138,16 +1138,12 @@ sub www_sendMessage {
                 $disabled  = "";
                 $activeFriendCount++;
             }
-            my $fname      = $friend->profileField("firstName");
-            my $lname      = $friend->profileField("lastName");
-            my $wholeName  = "";
-            $wholeName     = $fname." ".$lname if($fname && $lname);
 
             my $isChecked  = WebGUI::Utility::isIn($friendId,@friendsChecked);            
             my $friendHash = {
                 'friend_id'        => $friendId,
                 'friend_name'      => $friends->{$friendId},
-                'friend_wholeName' => $wholeName,
+                'friend_wholeName' => $friend->getWholeName,
             };
 
             push(@checkedFriends,$friendHash) if($isChecked);