aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Webpages.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-05-09 09:26:38 +0200
committerMario Vavti <mario@mariovavti.com>2016-05-09 09:26:38 +0200
commitc8f686b8a553586a65e5bb4ceda5d1016d1c15be (patch)
tree7bb4ab1659e7a90c38a30a6925a0ec698867e4f5 /Zotlabs/Module/Webpages.php
parent75128e8f68e829ad9e3670dac82f075d9632dba4 (diff)
parent94accd8a4c7500ee4f5c268fe7e84ad3ed9a6675 (diff)
downloadvolse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.tar.gz
volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.tar.bz2
volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs/Module/Webpages.php')
-rw-r--r--Zotlabs/Module/Webpages.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index 84d58058e..18dd57473 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -4,6 +4,7 @@ namespace Zotlabs\Module;
require_once('include/identity.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
+require_once('include/PermissionDescription.php');
class Webpages extends \Zotlabs\Web\Controller {
@@ -111,7 +112,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'),
'bang' => '',
- 'acl' => (($is_owner) ? populate_acl($channel_acl,false) : ''),
+ 'acl' => (($is_owner) ? populate_acl($channel_acl,false, \PermissionDescription::fromGlobalPermission('view_pages')) : ''),
'showacl' => (($is_owner) ? true : false),
'visitor' => true,
'profile_uid' => intval($owner),