Version 5.0.0 beta 6

applications/calendar/sources/Event/Event.php

@@ -2004,10 +2004,11 @@ class Event extends Item implements Embeddable,
 	/**
 	 * Create Notification
 	 *
-	 * @param	string|NULL		$extra		Additional data
+	 * @param	mixed		$extra		Additional data
+	 * @param	Comment|null	$comment
 	 * @return	Notification
 	 */
-	protected function createNotification( ?string $extra=NULL ) : Notification
+	public function createNotification( mixed $extra=NULL, ?Comment $comment=null ): Notification
 	{
 		// New content is sent with itself as the item as we deliberately do not group notifications about new content items. Unlike comments where you're going to read them all - you might scan the notifications list for topic titles you're interested in
 		return new Notification( Application::load( 'calendar' ), 'new_content', $this, array( $this ) );
@@ -2080,12 +2081,13 @@ class Event extends Item implements Embeddable,
 	 * @param bool $skipPermissions Skip permission checks (used by REST API to fetch all events which are filtered on later)
 	 * @param array|null $location Array of item lat and long
 	 * @param int|null $online Online events?
+	 * @param array|null $where	Additional where clause
 	 * @return ActiveRecordIterator|array
 	 * @see        \IPS\Content\_Item::getItemsWithPermission()
 	 */
-	public static function retrieveEvents( Date $startDate, Date $endDate=NULL, Calendar|array $calendar=NULL, int $limit=NULL, bool $formatEvents=TRUE, Member $member=NULL, Venue $venue=NULL, bool $skipPermissions=FALSE, array $location = NULL, ?int $online = NULL ): ActiveRecordIterator|array
+	public static function retrieveEvents( Date $startDate, Date $endDate=NULL, Calendar|array $calendar=NULL, int $limit=NULL, bool $formatEvents=TRUE, Member $member=NULL, Venue $venue=NULL, bool $skipPermissions=FALSE, array $location = NULL, ?int $online = NULL, ?array $where=null ): ActiveRecordIterator|array
 	{
-		$where	= array();
+		$where	= is_array( $where ) ? $where : array();
 
 		if ( $calendar !== NULL )
 		{