← All changes | classes/models/FrmEntryValidate.php +2 -15 6.3 → 6.0 View file →

		@@ -3,14 +3,8 @@
3	3	die( 'You are not allowed to call this page directly.' );
4	4	}
5	5
6	6	class FrmEntryValidate {
7		-
8		- /**
9		- * @param array $values
10		- * @param string[]|bool $exclude
11		- * @return array
12		- */
13	7	public static function validate( $values, $exclude = false ) {
14	8	FrmEntry::sanitize_entry_post( $values );
15	9	$errors = array();
16	10
		@@ -49,16 +43,10 @@
49	43	* @param array $errors Errors data.
50	44	* @param array $values Value data of the form.
51	45	* @param array $args Custom arguments. Contains `exclude` and `posted_fields`.
52	46	*/
53		- $filtered_errors = apply_filters( 'frm_validate_entry', $errors, $values, compact( 'exclude', 'posted_fields' ) );
	47	+ $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact( 'exclude', 'posted_fields' ) );
54	48
55		- if ( is_array( $filtered_errors ) ) {
56		- $errors = $filtered_errors;
57		- } else {
58		- _doing_it_wrong( __FUNCTION__, 'Only arrays should be returned when using the frm_validate_entry filter.', '6.3' );
59		- }
60		-
61	49	return $errors;
62	50	}
63	51
64	52	private static function set_item_key( &$values ) {
		@@ -316,10 +304,9 @@
316	304	}
317	305
318	306	/**
319	307	* @param int $form_id
320		- *
321		- * @return bool|string
	308	+ * @return boolean
322	309	*/
323	310	private static function is_antispam_check( $form_id ) {
324	311	$aspm = new FrmAntiSpam( $form_id );
325	312	return $aspm->validate();