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/Rpost.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/Rpost.php')
-rw-r--r-- | Zotlabs/Module/Rpost.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 1396f2a55..32d52c30c 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -7,7 +7,6 @@ require_once('include/items.php'); require_once('include/taxonomy.php'); require_once('include/conversation.php'); require_once('include/zot.php'); -require_once('include/PermissionDescription.php'); /** * remote post @@ -116,7 +115,7 @@ class Rpost extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl, true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'acl' => populate_acl($channel_acl, true, Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'bang' => '', 'visitor' => true, 'profile_uid' => local_channel(), |