From: Art4 Date: Mon, 12 May 2025 14:32:53 +0000 (+0000) Subject: Merge branch 'develop' into eventdispatcher-part3 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ea172010f8f4b87e5e580ad0142c95ae98a9faae;p=friendica.git Merge branch 'develop' into eventdispatcher-part3 --- ea172010f8f4b87e5e580ad0142c95ae98a9faae diff --cc src/Model/Event.php index a254a8cf8b,01d1d9df1f..11fe8a9b4b --- a/src/Model/Event.php +++ b/src/Model/Event.php @@@ -305,12 -302,10 +305,12 @@@ class Even $event['id'] = DBA::lastInsertId(); - Hook::callAll("event_created", $event['id']); + $eventDispatcher->dispatch( + new ArrayFilterEvent(ArrayFilterEvent::EVENT_CREATED, ['event' => $event]), + ); } - return $event['id']; + return (int) $event['id']; } public static function getItemArrayForId(int $event_id, array $item = []): array diff --cc src/Model/Item.php index df8e8eeccc,018f4dc799..62e6aff96b --- a/src/Model/Item.php +++ b/src/Model/Item.php @@@ -845,16 -849,11 +848,17 @@@ class Ite $dummy_session = false; } - /** @var array */ - $item = $eventDispatcher->dispatch( - new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $item) + $hook_data = [ + 'item' => $item, + ]; + + $hook_data = $eventDispatcher->dispatch( + new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL, $hook_data) )->getArray(); ++ /** @var array */ + $item = $hook_data['item'] ?? $item; + if ($dummy_session) { unset($_SESSION['authenticated']); unset($_SESSION['uid']);