| @@ -9,16 +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'; |
| 17 | 16 | |
| 18 | 17 | /** |
| 18 | + * @var string | |
| 19 | + */ | |
| 20 | + protected $display_type = 'text'; | |
| 21 | + | |
| 22 | + /** | |
| 19 | 23 | * @var bool |
| 20 | - * | |
| 21 | 24 | * @since 3.0 |
| 22 | 25 | */ |
| 23 | 26 | protected $holds_email_values = true; |
| 24 | 27 | |
| @@ -45,24 +48,18 @@ | ||
| 45 | 48 | * |
| 46 | 49 | * @return array |
| 47 | 50 | */ |
| 48 | 51 | public function validate( $args ) { |
| 49 | - if ( ! $args['value'] ) { | |
| 50 | - return array(); | |
| 51 | - } | |
| 52 | - | |
| 53 | 52 | $errors = array(); |
| 54 | - | |
| 55 | - if ( false !== strpos( $args['value'], '.@' ) || ! is_email( $args['value'] ) ) { | |
| 53 | + if ( $args['value'] != '' && ! is_email( $args['value'] ) ) { | |
| 56 | 54 | $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); |
| 57 | 55 | } |
| 56 | + | |
| 58 | 57 | return $errors; |
| 59 | 58 | } |
| 60 | 59 | |
| 61 | 60 | /** |
| 62 | 61 | * @since 4.0.04 |
| 63 | - * | |
| 64 | - * @param array|string $value Email value passed by reference. | |
| 65 | 62 | * |
| 66 | 63 | * @return void |
| 67 | 64 | */ |
| 68 | 65 | public function sanitize_value( &$value ) { |