diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-08-23 06:57:10 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-08-23 06:57:10 -0400 |
| commit | 420aa4bc44a2fdf707b3964582258809f978ea2d (patch) | |
| tree | c6def258a9311d513d6e1e89918c2ec0d17114f7 /include/zot.php | |
| parent | 305e0538d293ff4ad72f30b11998ae3b06efa4ea (diff) | |
| parent | 1e6a491400eaa01aeb2991d4b38e0255499d8b67 (diff) | |
| download | volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.gz volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.bz2 volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.zip | |
Merge remote-tracking branch 'upstream/dev' into website-export
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/zot.php b/include/zot.php index 01b29f74b..c3c924113 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3708,6 +3708,8 @@ function zotinfo($arr) { } } + $ztarget_hash = (($ztarget && $zsig) ? make_xchan_hash($ztarget,$zsig) : '' ); + $r = null; if(strlen($zhash)) { @@ -3783,11 +3785,11 @@ function zotinfo($arr) { if($role === 'forum' || $role === 'repository') { $public_forum = true; } - else { + elseif($ztarget_hash) { // check if it has characteristics of a public forum based on custom permissions. $t = q("select * from abconfig where abconfig.cat = 'my_perms' and abconfig.chan = %d and abconfig.xchan = '%s' and abconfig.k in ('tag_deliver', 'send_stream') ", intval($e['channel_id']), - dbesc($e['channel_hash']) + dbesc($ztarget_hash) ); $ch = 0; @@ -3889,9 +3891,6 @@ function zotinfo($arr) { $ret['follow_url'] = z_root() . '/follow?f=&url=%s'; - $ztarget_hash = (($ztarget && $zsig) - ? make_xchan_hash($ztarget,$zsig) - : '' ); $permissions = get_all_perms($e['channel_id'],$ztarget_hash,false); |