Committer: anazarov
LJSV-1609: Links for identity accounts on friendlist.bml (nopics=1) should point to users' profiles instead of their journalsU trunk/htdocs/tools/friendlist.bml
Modified: trunk/htdocs/tools/friendlist.bml =================================================================== --- trunk/htdocs/tools/friendlist.bml 2011-10-14 11:34:49 UTC (rev 20323) +++ trunk/htdocs/tools/friendlist.bml 2011-10-14 12:34:38 UTC (rev 20324) @@ -133,14 +133,6 @@ my $maxcol = 5; - my $format_userlink = sub { - my ($given_u, $userlink) = @_; - - return "<strike>$userlink</strike>" if $given_u->is_deleted || $given_u->is_expunged || $given_u->is_suspended; - return "<b>$userlink</b>" if $show_mutual_friends && $remote_friend_uids{$given_u->id}; - return $userlink; - }; - if ($pics) { ROW: while (1) { @@ -161,8 +153,16 @@ $body .= " </tr>\n"; } } else { - my @friend_usernames = map { $format_userlink->($_, "<a href='" . $_->journal_base . "'>" . $_->display_username . "</a>") } @friends; - $body .= "<p>" . join(", ", @friend_usernames) . "</p>"; + $body .= "<p>"; + for (my $i = 0; $i < @friends; $i++ ) { + my $friend = $friends[$i]; + my $n = $friend->display_username; + $n = '<b>'. $n. '</b>' if $show_mutual_friends and $remote_friend_uids{$friend->{userid}}; + $n = '<strike>'. $n. '</strike>' if $friend->is_deleted or $friend->is_expunged or $friend->is_suspended; + $body .= ', ' if $i; + $body .= '<a href="'. $friend->profile_url. '">'. $n. '</a>'; + } + $body .= '</p>'; } $body .= "</table>\n";