From 5d4c3c06473b17a7479129a9538c3917dc98890f Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 21 Dec 2011 13:37:23 +0100 Subject: [PATCH 1/1] =?utf8?q?Don=E2=80=99t=20get=20trust=20values=20if=20?= =?utf8?q?it=E2=80=99s=20irrelevant.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java index 36fa42d..05857cf 100644 --- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java @@ -79,8 +79,8 @@ public class ProfileAccessor extends ReflectionAccessor { if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) { return avatarId; } - if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) { - return avatarId; + if (showCustomAvatars == ShowCustomAvatars.FOLLOWED) { + return currentSone.hasFriend(remoteSone.getId()) ? avatarId : null; } Trust trust = core.getTrust(currentSone, remoteSone); if (trust == null) { -- 2.7.4