aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2015-02-05 09:15:39 -0800
committerHabeas Codice <habeascodice@federated.social>2015-02-05 09:15:39 -0800
commit9ed23f9081b56369349d4e06c51e3856f950804e (patch)
treeb3a1121ec41e04cce02cfa07fc958b95a3fd289b /include/conversation.php
parent88488fdfbb58aa04b450af1691aba7cea1bce8ab (diff)
parent646a874390be8f92736866118d7215e8cb80fb8a (diff)
downloadvolse-hubzilla-9ed23f9081b56369349d4e06c51e3856f950804e.tar.gz
volse-hubzilla-9ed23f9081b56369349d4e06c51e3856f950804e.tar.bz2
volse-hubzilla-9ed23f9081b56369349d4e06c51e3856f950804e.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 9429af754..952d7d322 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -619,10 +619,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$profile_link = zid($profile_link);
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
- if(x($a->contacts,$normalised))
- $profile_avatar = $a->contacts[$normalised]['thumb'];
- else
- $profile_avatar = ((strlen($item['author-avatar'])) ? $a->get_cached_avatar_image($item['author-avatar']) : $item['thumb']);
$profile_name = $item['author']['xchan_name'];
$profile_link = $item['author']['xchan_url'];