diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-09 22:00:21 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-09 22:00:21 -0400 |
| commit | 0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be (patch) | |
| tree | 2e4f069d66885c5ca5b77154e9dd5a43ec004ff5 /Zotlabs/Module/Network.php | |
| parent | 9c8cf7d43372aeea4d8a450e7cb17d7a24b64d5f (diff) | |
| parent | ea1173f8f632151d02c71fe6004c6a64d014e80a (diff) | |
| download | volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.gz volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.bz2 volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 2badd7280..c88258a78 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -6,6 +6,7 @@ require_once('include/group.php'); require_once('include/contact_widgets.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); +require_once('include/PermissionDescription.php'); @@ -170,7 +171,7 @@ class Network extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'bang' => (($private_editing) ? '!' : ''), 'visitor' => true, 'profile_uid' => local_channel(), @@ -445,7 +446,7 @@ class Network extends \Zotlabs\Web\Controller { $ordering = "commented"; if($load) { - + // Fetch a page full of parent items for this page $r = q("SELECT distinct item.id AS item_id, $ordering FROM item @@ -468,7 +469,7 @@ class Network extends \Zotlabs\Web\Controller { ); $_SESSION['loadtime'] = datetime_convert(); } - + // Then fetch all the children of the parents that are on this page $parents_str = ''; $update_unseen = ''; |