*Merge.

--HG--
branch : trunk

1 files changed, 6 insertions, 9 deletions

diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp
index 529517d824a..2786618fbf8 100644
--- a/src/game/SocialMgr.cpp
+++ b/src/game/SocialMgr.cpp
@@ -186,10 +186,14 @@ void SocialMgr::GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &fri
     if(!player)
         return;
 
-    Player *pFriend = ObjectAccessor::FindPlayer(friendGUID);
+    friendInfo.Status = FRIEND_STATUS_OFFLINE;
+    friendInfo.Area = 0;
+    friendInfo.Level = 0;
+    friendInfo.Class = 0;
 
+    Player *pFriend = ObjectAccessor::FindPlayer(friendGUID);
     if(!pFriend)
-     return;
+        return;
 
     uint32 team = player->GetTeam();
     uint32 security = player->GetSession()->GetSecurity();
@@ -216,13 +220,6 @@ void SocialMgr::GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &fri
         friendInfo.Level = pFriend->getLevel();
         friendInfo.Class = pFriend->getClass();
     }
-    else
-    {
-        friendInfo.Status = FRIEND_STATUS_OFFLINE;
-        friendInfo.Area = 0;
-        friendInfo.Level = 0;
-        friendInfo.Class = 0;
-    }
 }
 
 void SocialMgr::MakeFriendStatusPacket(FriendsResult result, uint32 guid, WorldPacket *data)