Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 04a88e98bb5056eb2d845ffe65e53b9b822086e6..85976f8f878a2130f60506e22b2d90c02cd3b1b3 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -34,6 +34,7 @@ use Friendica\DI;
 use Friendica\Model\Conversation;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Module\BaseProfile;
 use Friendica\Module\Security\Login;
@@ -215,10 +216,10 @@ function events_post(App $a)
                exit();
        }
 
-       $item_id = Event::store($datarray);
+       $uri_id = Event::store($datarray);
 
        if (!$cid) {
-               Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $item_id);
+               Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$uri_id, (int)$uid);
        }
 
        DI::baseUrl()->redirect('events');
@@ -488,7 +489,7 @@ function events_content(App $a)
                $fdt = $orig_event['finish'] ?? 'now';
 
                $tz = date_default_timezone_get();
-               if (!empty($orig_event)) {
+               if (isset($orig_event['adjust'])) {
                        $tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
                }
 
@@ -589,7 +590,7 @@ function events_content(App $a)
                        Item::deleteForUser(['id' => $ev[0]['itemid']], local_user());
                }
 
-               if (Item::exists(['id' => $ev[0]['itemid']])) {
+               if (Post::exists(['id' => $ev[0]['itemid']])) {
                        notice(DI::l10n()->t('Failed to remove event'));
                }