Version 4.7.0

applications/calendar/extensions/core/AchievementAction/Rsvp.php

@@ -104,27 +104,30 @@ class _Rsvp extends \IPS\core\Achievements\Actions\AbstractAchievementAction //
 
 		return TRUE;
 	}
-	
+
 	/**
 	 * Get the labels for the people this action might give awards to
 	 *
+	 * @param	array|NULL		$filters	Current filter values
+	 *
 	 * @return	array
 	 */
-	public function awardOptions(): array
+	public function awardOptions( ?array $filters ): array
 	{
 		return [
 			'subject'	=> 'achievement_filter_Rsvp_receiver',
 			'other'		=> 'achievement_filter_Rsvp_giver'
 		];
 	}
-	
+
 	/**
 	 * Get the "other" people we need to award =stuff to
 	 *
-	 * @param	mixed	$extra		Any additional information about what is happening (e.g. if a post is being made: the post object)
+	 * @param	mixed		$extra		Any additional information about what is happening (e.g. if a post is being made: the post object)
+	 * @param	array|NULL	$filters	Current filter values
 	 * @return	array
 	 */
-	public function awardOther( $extra = NULL ): array
+	public function awardOther( $extra = NULL, ?array $filters = NULL ): array
 	{
 		return [ $extra->author() ];
 	}

applications/calendar/extensions/core/EditorLocations/Calendar.php

@@ -44,6 +44,37 @@ class _Calendar
 	{
 		return NULL;
 	}
+	
+	/**
+	 * Can whatever is posted in this editor be moderated?
+	 * If this returns TRUE, we must ensure the content is ran through word, link and image filters
+	 *
+	 * @param	\IPS\Member					$member	The member
+	 * @param	\IPS\Helpers\Form\Editor	$field	The editor field
+	 * @return	bool
+	 */
+	public function canBeModerated( $member, $field )
+	{
+		/* Creating/editing an event */
+		if ( preg_match( '/^calendar-event(?:\-\d+)?$/', $field->options['autoSaveKey'] ) )
+		{
+			return TRUE;
+		}
+		/* Creating/editing a comment */
+		elseif ( preg_match( '/^(?:editComment|reply|review)\-calendar\/calendar\-\d+/', $field->options['autoSaveKey'] ) )
+		{
+			return TRUE;
+		}
+		/* Unknown */
+		else
+		{
+			if ( \IPS\IN_DEV )
+			{
+				throw new \RuntimeException( 'Unknown canBeModerated: ' . $field->options['autoSaveKey'] );
+			}
+			return FALSE;
+		}
+	}
 
 	/**
 	 * Permission check for attachments