diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-22 13:22:01 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-22 13:22:01 -0700 |
| commit | 823c0ebb47a8a39dbecae6902b0fe0dce158e417 (patch) | |
| tree | 7208626d06a0a3637739629d296999170f135dd0 /Zotlabs | |
| parent | 8fc87411fa2b51d56abd7bf2b34a497485a94373 (diff) | |
| parent | 5fb173149a53361f9b91b0aa46323b9d4dbada7f (diff) | |
| download | volse-hubzilla-823c0ebb47a8a39dbecae6902b0fe0dce158e417.tar.gz volse-hubzilla-823c0ebb47a8a39dbecae6902b0fe0dce158e417.tar.bz2 volse-hubzilla-823c0ebb47a8a39dbecae6902b0fe0dce158e417.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Events.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index faa46881f..26455cf8e 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -440,8 +440,6 @@ class Events extends \Zotlabs\Web\Controller { $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults); - //print_r(acl2json($permissions['allow_gid'])); killme(); - $tpl = get_markup_template('event_form.tpl'); $form = replace_macros($tpl,array( @@ -469,9 +467,6 @@ class Events extends \Zotlabs\Web\Controller { '$l_text' => (($event_id) ? t('Edit Location') : t('Location')), '$l_orig' => $l_orig, '$t_orig' => $t_orig, - '$sh_text' => t('Share this event'), - '$sh_checked' => $sh_checked, - '$share' => array('distr', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))), '$preview' => t('Preview'), '$perms_label' => t('Permission settings'), // populating the acl dialog was a permission description from view_stream because Cal.php, which @@ -483,6 +478,8 @@ class Events extends \Zotlabs\Web\Controller { '$deny_cid' => acl2json($permissions['deny_cid']), '$deny_gid' => acl2json($permissions['deny_gid']), + '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), + '$submit' => t('Submit'), '$advanced' => t('Advanced Options') |