diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-05 21:49:24 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-05 21:49:24 -0400 |
| commit | 3011d3768cb524ccf795ed64924649a2e30a036b (patch) | |
| tree | 067cfd2421cddefe882911fe9ef930958ee2eb8a /Zotlabs/Module/Network.php | |
| parent | 6ce939491bf932c20c9777a8518da5875e02a6b1 (diff) | |
| parent | 5508feb6ce185d4da12adbd38dc2c0e36d244704 (diff) | |
| download | volse-hubzilla-3011d3768cb524ccf795ed64924649a2e30a036b.tar.gz volse-hubzilla-3011d3768cb524ccf795ed64924649a2e30a036b.tar.bz2 volse-hubzilla-3011d3768cb524ccf795ed64924649a2e30a036b.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index e4b936dc2..2badd7280 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -155,14 +155,6 @@ class Network extends \Zotlabs\Web\Controller { nav_set_selected('network'); - // I'm trying to make two points in this description text - warn about finality of wall - // post permissions, and try to clear up confusion that these permissions set who is - // *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking - // the "Show" button on a group does not post it to the feed of people in that group, it - // mearly allows those people to view the post if they are viewing/following this channel. - $aclDesc = t('Post permissions <b>cannot be changed</b> after a post is sent.</br />These permissions set who is allowed to view the post.'); - $aclContextHelpCmd = 'acl_dialog_post'; - $channel_acl = array( 'allow_cid' => $channel['channel_allow_cid'], 'allow_gid' => $channel['channel_allow_gid'], @@ -178,7 +170,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') : ''), $aclDesc, $aclContextHelpCmd), + 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), get_post_aclDialogDescription(), 'acl_dialog_post'), 'bang' => (($private_editing) ? '!' : ''), 'visitor' => true, 'profile_uid' => local_channel(), |