← All changes | classes/models/fields/FrmFieldEmail.php +3 -20 6.26 → 5.0 View file →

		@@ -9,28 +9,19 @@
9	9	class FrmFieldEmail extends FrmFieldType {
10	10
11	11	/**
12	12	* @var string
13		- *
14	13	* @since 3.0
15	14	*/
16	15	protected $type = 'email';
	16	+ protected $display_type = 'text';
17	17
18	18	/**
19	19	* @var bool
20		- *
21	20	* @since 3.0
22	21	*/
23	22	protected $holds_email_values = true;
24	23
25		- /**
26		- * @var bool
27		- */
28		- protected $array_allowed = false;
29		-
30		- /**
31		- * @return bool[]
32		- */
33	24	protected function field_settings_for_type() {
34	25	return array(
35	26	'size' => true,
36	27	'clear_on_focus' => true,
		@@ -45,26 +36,18 @@
45	36	*
46	37	* @return array
47	38	*/
48	39	public function validate( $args ) {
49		- if ( ! $args['value'] ) {
50		- return array();
51		- }
52		-
53	40	$errors = array();
54		-
55		- if ( false !== strpos( $args['value'], '.@' ) || ! is_email( $args['value'] ) ) {
	41	+ if ( $args['value'] != '' && ! is_email( $args['value'] ) ) {
56	42	$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
57	43	}
	44	+
58	45	return $errors;
59	46	}
60	47
61	48	/**
62	49	* @since 4.0.04
63		- *
64		- * @param array|string $value Email value passed by reference.
65		- *
66		- * @return void
67	50	*/
68	51	public function sanitize_value( &$value ) {
69	52	FrmAppHelper::sanitize_value( 'sanitize_email', $value );
70	53	}