diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-17 15:04:04 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-17 15:04:04 -0800 |
| commit | a089064588352b60bebf27c94a51d480f8062368 (patch) | |
| tree | 796fc893c37ecc3a19c469b2a067fcb2765a698d /include | |
| parent | a06f7fbe2e78de428489d824c1329ef29c4d1f42 (diff) | |
| parent | 7c4d9519c89aed59e9253a19203fb13394571929 (diff) | |
| download | volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.tar.gz volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.tar.bz2 volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index a7d5f3fa5..57dc9d2a2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1025,7 +1025,7 @@ function builtin_activity_puller($item, &$conv_responses) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s']) - ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s']) . ' alt="' . urlencode($name) . '" /> ' . $name . '</a>' + ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="dropdown-menu-img-xs" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" />' . $name . '</a>' : '<a href="#" class="disabled">' . $name . '</a>' ); |