Commit 7f10f82c authored by Nigel McNie's avatar Nigel McNie
Browse files

(#3161) Show pending friend message (with correct formatting) on pending friends page.

parent 3e40be79
......@@ -1001,7 +1001,7 @@ function get_users_data($userlist) {
(SELECT 1 FROM {usr_friend} WHERE ((usr1 = ? AND usr2 = u.id) OR (usr2 = ? AND usr1 = u.id))) AS friend,
(SELECT 1 FROM {usr_friend_request} fr WHERE fr.requester = ? AND fr.owner = u.id) AS requestedfriendship,
(SELECT title FROM {artefact} WHERE artefacttype = \'introduction\' AND owner = u.id) AS introduction,
NULL AS reason
NULL AS message
FROM {usr} u
WHERE u.id IN (' . $userlist . ')
UNION
......
......@@ -2285,6 +2285,10 @@ table.groupviews{
#memberlist {
border-bottom: 1px solid #95a8b7;
}
#friendslist .pending {
margin-left: 50px;
margin-top: .5em;
}
/* FORUMS */
......
......@@ -25,8 +25,8 @@
<div class="pending">
<strong>
{str tag='whymakemeyourfriend' section='group'}
{$user->message}
</strong>
<div>{$user->message|format_whitespace}</div>
</div>
<div>
<ul>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment