From 2d83ea86dca57e6fde65ee93366974ed53d0784f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 8 Sep 2016 22:33:39 -0700 Subject: more get rid of illegal offset in include/conversation --- Zotlabs/Module/Webpages.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Zotlabs/Module/Webpages.php') diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index acaca16c3..0da699c73 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -136,9 +136,11 @@ class Webpages extends \Zotlabs\Web\Controller { 'deny_gid' => $channel['channel_deny_gid'] ); } - else - $channel_acl = array(); + else { + $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; + } + $is_owner = ($uid && $uid == $owner); $o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); @@ -148,7 +150,7 @@ class Webpages extends \Zotlabs\Web\Controller { 'nickname' => \App::$profile['channel_address'], 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'acl' => (($is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')) : ''), - 'permissions' => (($is_owner) ? $channel_acl : ''), + 'permissions' => $channel_acl, 'showacl' => (($is_owner) ? true : false), 'visitor' => true, 'hide_location' => true, -- cgit v1.2.3