Merge branch 'master' into development/2.9.x

This commit is contained in:
Mykyta Synelnikov
2025-06-25 16:33:41 +03:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -937,9 +937,9 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
break;
}
if ( ! empty( $array['required'] ) && '' === $submitted_data[ $key ] ) {
if ( ! empty( $array['required'] ) && empty( $submitted_data[ $key ] ) ) {
UM()->form()->add_error( $key, __( 'You must provide your email', 'ultimate-member' ) );
} elseif ( ! is_email( $submitted_data[ $key ] ) || email_exists( $submitted_data[ $key ] ) ) {
} elseif ( ! empty( $submitted_data[ $key ] ) && ( ! is_email( $submitted_data[ $key ] ) || email_exists( $submitted_data[ $key ] ) ) ) {
UM()->form()->add_error( $key, __( 'The email you entered is incorrect', 'ultimate-member' ) );
} elseif ( 'secondary_user_email' === $key && ! empty( $submitted_data[ $key ] ) && ! empty( $submitted_data['user_email'] ) && $submitted_data[ $key ] === $submitted_data['user_email'] ) {
UM()->form()->add_error( $key, __( 'The secondary email cannot be the same as primary', 'ultimate-member' ) );
+1 -1
View File
@@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2025-06-25T13:01:29+00:00\n"
"POT-Creation-Date: 2025-06-25T13:24:33+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.12.0\n"
"X-Domain: ultimate-member\n"