diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-28 14:59:10 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-28 14:59:10 +0200 |
| commit | 6bae91dd7e259ae69184a898757c090396ec1fc2 (patch) | |
| tree | 0c0927613936c5cc127a0baf6df759dde9bddc74 | |
| parent | 5a475453ab2939836ab8a541de6ca9608781a0c8 (diff) | |
| parent | ddebbcc0a08aae9cd33bb3105ce1f2c8863b544c (diff) | |
| download | volse-hubzilla-6bae91dd7e259ae69184a898757c090396ec1fc2.tar.gz volse-hubzilla-6bae91dd7e259ae69184a898757c090396ec1fc2.tar.bz2 volse-hubzilla-6bae91dd7e259ae69184a898757c090396ec1fc2.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Network.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 82c88e565..942b48109 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -131,7 +131,7 @@ class Network extends \Zotlabs\Web\Controller { if(x($_GET,'search') || x($_GET,'file')) $nouveau = true; if($cid) { - $r = q("SELECT abook_xchan FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", + $r = q("SELECT abook_xchan, xchan_addr, xchan_url FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($cid), intval(local_channel()) ); @@ -144,7 +144,7 @@ class Network extends \Zotlabs\Web\Controller { // NOTREACHED } if($_GET['pf'] === '1') - $deftag = '!' . t('forum') . '+' . intval($cid); + $deftag = '!{' . (($r[0]['xchan_addr']) ? $r[0]['xchan_addr'] : $r[0]['xchan_url']) . '}'; else $def_acl = [ 'allow_cid' => '<' . $r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; } |