diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-30 06:30:46 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-30 06:30:46 -0400 |
| commit | f17f51a9c1f62dc0229e2428cacea4e84313560e (patch) | |
| tree | 7486b05738e943bf39619d06bec9d83d7795e746 /include/channel.php | |
| parent | 5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6 (diff) | |
| parent | d858bd9265a4a0fa3589cdb2126031998310c7c3 (diff) | |
| download | volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.gz volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.bz2 volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php index 708e70b1c..88dd818e6 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1371,7 +1371,8 @@ function zat_init() { dbesc($_REQUEST['zat']) ); if($r) { - atoken_login($r[0]); + $xchan = atoken_xchan($r[0]); + atoken_login($xchan); } } @@ -1567,7 +1568,7 @@ function is_public_profile() { return false; $channel = App::get_channel(); if($channel) { - $perm = \Zotlabs\Access\PermissionLimit::Get($channel['channel_id'],'view_profile'); + $perm = \Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'); if($perm == PERMS_PUBLIC) return true; } |