diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-12 21:43:05 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-12 21:43:05 -0400 |
| commit | 513175982367a970d491948f7d8aa1488f6a4340 (patch) | |
| tree | c97fe4dcdd92383144123844fa27fb03ed1af2d9 /Zotlabs/Module/Webpages.php | |
| parent | 1e4ef812445e4d8617223ce917d0eb2215e9c3b3 (diff) | |
| parent | b6987b4287bb2492b8f4000bdef08b376aa5f265 (diff) | |
| download | volse-hubzilla-513175982367a970d491948f7d8aa1488f6a4340.tar.gz volse-hubzilla-513175982367a970d491948f7d8aa1488f6a4340.tar.bz2 volse-hubzilla-513175982367a970d491948f7d8aa1488f6a4340.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'Zotlabs/Module/Webpages.php')
| -rw-r--r-- | Zotlabs/Module/Webpages.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 6419d608b..9ece989a0 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -4,7 +4,6 @@ namespace Zotlabs\Module; require_once('include/channel.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); -require_once('include/PermissionDescription.php'); class Webpages extends \Zotlabs\Web\Controller { @@ -105,7 +104,7 @@ class Webpages extends \Zotlabs\Web\Controller { 'is_owner' => true, '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, \PermissionDescription::fromGlobalPermission('view_pages')) : ''), + 'acl' => (($is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')) : ''), 'showacl' => (($is_owner) ? true : false), 'visitor' => true, 'hide_location' => true, |