From a06f1f95944ffa578296268ecde3d77f42b69229 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Sep 2013 02:47:36 -0700 Subject: Issue #158 --- mod/network.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mod/network.php') diff --git a/mod/network.php b/mod/network.php index ac8c38290..72391497b 100644 --- a/mod/network.php +++ b/mod/network.php @@ -452,16 +452,16 @@ function network_content(&$a, $update = 0, $load = false) { elseif($cid) { - $r = q("SELECT * from abook where abook_id = %d and abook_channel = %d and not ( abook_flags & " . intval(ABOOK_FLAG_BLOCKED) . ") limit 1", + $r = q("SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and not ( abook_flags & " . intval(ABOOK_FLAG_BLOCKED) . ") limit 1", intval($cid), intval(local_user()) ); if($r) { $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_user()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) "; - $o = '

' . t('Contact: ') . $r[0]['name'] . '

' . $o; + $o = '

' . t('Connection: ') . $r[0]['xchan_name'] . '

' . $o; } else { - notice( t('Invalid contact.') . EOL); + notice( t('Invalid connection.') . EOL); goaway($a->get_baseurl(true) . '/network'); } } -- cgit v1.2.3