diff options
author | Mario Vavti <mario@mariovavti.com> | 2019-05-01 15:52:17 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2019-05-01 15:52:17 +0200 |
commit | c9a5f21344f985f5b4ee53ff349a9ac47116a778 (patch) | |
tree | 5f6f4ac9455284788d879d80f27b3952951752ee /Zotlabs | |
parent | 9594ce9a8a1295a1e085bc53ab93a77055de2a77 (diff) | |
download | volse-hubzilla-c9a5f21344f985f5b4ee53ff349a9ac47116a778.tar.gz volse-hubzilla-c9a5f21344f985f5b4ee53ff349a9ac47116a778.tar.bz2 volse-hubzilla-c9a5f21344f985f5b4ee53ff349a9ac47116a778.zip |
calendar merge: remove deprecated share variable
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index a600adbfa..67e6557f9 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -125,10 +125,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller { } //goaway($onerror_url); } - - // $share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0); - - $share = 1; $channel = \App::get_channel(); @@ -152,23 +148,10 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $created = $x[0]['created']; $edited = datetime_convert(); - - if($x[0]['allow_cid'] === '<' . $channel['channel_hash'] . '>' - && $x[0]['allow_gid'] === '' && $x[0]['deny_cid'] === '' && $x[0]['deny_gid'] === '') { - $share = false; - } - else { - $share = true; - } } else { $created = $edited = datetime_convert(); - if($share) { - $acl->set_from_array($_POST); - } - else { - $acl->set(array('allow_cid' => '<' . $channel['channel_hash'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '')); - } + $acl->set_from_array($_POST); } $post_tags = array(); @@ -239,8 +222,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller { } } - if($share) - \Zotlabs\Daemon\Master::Summon(array('Notifier','event',$item_id)); + \Zotlabs\Daemon\Master::Summon(array('Notifier','event',$item_id)); killme(); |