harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hubzilla issue #1200

Browse Source
This commit is contained in:
zotlabs 2018-05-27 17:46:25 -07:00
parent eb04dbc5ce
commit ddebbcc0a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Network.php
View File

@ -131,7 +131,7 @@ class Network extends \Zotlabs\Web\Controller {
if(x($_GET,'search') || x($_GET,'file')) if(x($_GET,'search') || x($_GET,'file'))
$nouveau = true; $nouveau = true;
if($cid) { 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($cid),
intval(local_channel()) intval(local_channel())
); );
@ -144,7 +144,7 @@ class Network extends \Zotlabs\Web\Controller {
// NOTREACHED // NOTREACHED
} }
if($_GET['pf'] === '1') if($_GET['pf'] === '1')
$deftag = '!' . t('forum') . '+' . intval($cid); $deftag = '!{' . (($r[0]['xchan_addr']) ? $r[0]['xchan_addr'] : $r[0]['xchan_url']) . '}';
else else
$def_acl = [ 'allow_cid' => '<' . $r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; $def_acl = [ 'allow_cid' => '<' . $r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
} }