aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
committerThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
commit70fd797994e4b861d20d99cec2a7d801e478d894 (patch)
tree5b00b61522f2c7136912396df54bd3251e3f17c8 /mod/network.php
parent2c9c206808fec2212141f8630ce534ed29a47037 (diff)
parent27e97571d44f9e69a66eead9da2de4209996457d (diff)
downloadvolse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.gz
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.bz2
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/network.php')
-rw-r--r--mod/network.php6
1 files changed, 3 insertions, 3 deletions
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 = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
+ $o = '<h2>' . t('Connection: ') . $r[0]['xchan_name'] . '</h2>' . $o;
}
else {
- notice( t('Invalid contact.') . EOL);
+ notice( t('Invalid connection.') . EOL);
goaway($a->get_baseurl(true) . '/network');
}
}