aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-27 17:46:25 -0700
committerzotlabs <mike@macgirvin.com>2018-05-27 17:46:25 -0700
commitddebbcc0a08aae9cd33bb3105ce1f2c8863b544c (patch)
tree10181bd94e0971211c2099a1f0279089b824d28c /Zotlabs
parenteb04dbc5ce2321ca5da4274005bd3e4352cf83fa (diff)
downloadvolse-hubzilla-ddebbcc0a08aae9cd33bb3105ce1f2c8863b544c.tar.gz
volse-hubzilla-ddebbcc0a08aae9cd33bb3105ce1f2c8863b544c.tar.bz2
volse-hubzilla-ddebbcc0a08aae9cd33bb3105ce1f2c8863b544c.zip
hubzilla issue #1200
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Network.php4
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' => '' ];
}