| @@ -178,15 +178,17 @@ | ||
| 178 | 178 | */ |
| 179 | 179 | public function validate( $args ) { |
| 180 | 180 | $errors = parent::validate( $args ); |
| 181 | 181 | |
| 182 | - if ( ! $errors && ! FrmFieldGdprHelper::hide_gdpr_field() ) { | |
| 183 | - $required = FrmField::get_option( $this->field, 'required' ); | |
| 182 | + if ( $errors || FrmFieldGdprHelper::hide_gdpr_field() ) { | |
| 183 | + return $errors; | |
| 184 | + } | |
| 184 | 185 | |
| 185 | - if ( ! $required && empty( $args['value'] ) ) { | |
| 186 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 187 | - $errors[ 'field' . $args['id'] ] = str_replace( '[field_name]', is_object( $this->field ) ? $this->field->name : $this->field['name'], $frm_settings->blank_msg ); | |
| 188 | - } | |
| 186 | + $required = FrmField::get_option( $this->field, 'required' ); | |
| 187 | + | |
| 188 | + if ( ! $required && empty( $args['value'] ) ) { | |
| 189 | + $frm_settings = FrmAppHelper::get_settings(); | |
| 190 | + $errors[ 'field' . $args['id'] ] = str_replace( '[field_name]', is_object( $this->field ) ? $this->field->name : $this->field['name'], $frm_settings->blank_msg ); | |
| 189 | 191 | } |
| 190 | 192 | |
| 191 | 193 | return $errors; |
| 192 | 194 | } |
| @@ -202,9 +204,9 @@ | ||
| 202 | 204 | * @return bool |
| 203 | 205 | */ |
| 204 | 206 | public static function force_required_field( $required, $field ) { |
| 205 | 207 | if ( ! $required && 'gdpr' === $field['type'] && ! FrmFieldGdprHelper::hide_gdpr_field() ) { |
| 206 | - $required = true; | |
| 208 | + return true; | |
| 207 | 209 | } |
| 208 | 210 | |
| 209 | 211 | return $required; |
| 210 | 212 | } |
