diff options
| author | Mario <mario@mariovavti.com> | 2018-01-09 09:00:20 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-01-09 09:00:20 +0100 |
| commit | 4f4d0e416eac87121898b8a27b1afa6065ff17a2 (patch) | |
| tree | aae7f2582b2b9c6596dcbf87c06a836434140830 /include/acl_selectors.php | |
| parent | 22c89b6c660e185d5c5c6362acf23b145d932d15 (diff) | |
| parent | 8fde0f01b8472082158b38386046ed606bcfbc49 (diff) | |
| download | volse-hubzilla-3.0.tar.gz volse-hubzilla-3.0.tar.bz2 volse-hubzilla-3.0.zip | |
Merge branch '3.0RC'3.0
Diffstat (limited to 'include/acl_selectors.php')
| -rw-r--r-- | include/acl_selectors.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 09c24f82c..4e203074b 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -110,7 +110,7 @@ function fixacl(&$item) { * * @param array $defaults Optional access control list for the initial state of the dialog. * @param boolean $show_jotnets Whether plugins for federated networks should be included in the permissions dialog -* @param PermissionDescription $emptyACL_description - An optional description for the permission implied by selecting an empty ACL. Preferably an instance of PermissionDescription. +* @param \Zotlabs\Lib\PermissionDescription $emptyACL_description - An optional description for the permission implied by selecting an empty ACL. Preferably an instance of PermissionDescription. * @param string $dialog_description Optional message to include at the top of the dialog. E.g. "Warning: Post permissions cannot be changed once sent". * @param string $context_help Allows the dialog to present a help icon. E.g. "acl_dialog_post" * @param boolean $readonly Not implemented yet. When implemented, the dialog will use acl_readonly.tpl instead, so that permissions may be viewed for posts that can no longer have their permissions changed. @@ -172,7 +172,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti if(count($allow_cid) === 1 && $channel && $allow_cid[0] = $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) { $just_me = true; $custom = false; - } + } $r = q("SELECT id, profile_guid, profile_name from profile where is_default = 0 and uid = %d order by profile_name", intval(local_channel()) |