From 5e126d9437d1efa60712ad0913a3f0500f3f95cd Mon Sep 17 00:00:00 2001 From: Champ Camba Date: Fri, 15 Nov 2019 17:27:27 +0800 Subject: [PATCH 1/3] Add Form fields validation for E-mail( not unique ) --- includes/core/class-builtin.php | 1 + includes/core/um-actions-form.php | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php index 528d3480..52340bdd 100644 --- a/includes/core/class-builtin.php +++ b/includes/core/class-builtin.php @@ -1342,6 +1342,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) { $array['skype'] = __('Skype ID','ultimate-member'); $array['soundcloud'] = __('SoundCloud Profile','ultimate-member'); $array['twitter_url'] = __('Twitter URL','ultimate-member'); + $array['is_email'] = __('E-mail( Not Unique )','ultimate-member'); $array['unique_email'] = __('Unique E-mail','ultimate-member'); $array['unique_value'] = __('Unique Metakey value','ultimate-member'); $array['unique_username'] = __('Unique Username','ultimate-member'); diff --git a/includes/core/um-actions-form.php b/includes/core/um-actions-form.php index 95919266..2d867b7f 100644 --- a/includes/core/um-actions-form.php +++ b/includes/core/um-actions-form.php @@ -714,6 +714,17 @@ function um_submit_form_errors_hook_( $args ) { } + break; + + case 'is_email': + + $args[ $key ] = trim( $args[ $key ] ); + + if ( $args[ $key ] != '' && !is_email( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') ); + } + + break; case 'unique_value': From b6138eb665e289ef7372a689631b4959e65efd37 Mon Sep 17 00:00:00 2001 From: Champ Camba Date: Fri, 15 Nov 2019 21:43:29 +0800 Subject: [PATCH 2/3] Fix fatal error - check if wpml is active --- includes/core/class-external-integrations.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/includes/core/class-external-integrations.php b/includes/core/class-external-integrations.php index 95da7c6f..0ee43631 100644 --- a/includes/core/class-external-integrations.php +++ b/includes/core/class-external-integrations.php @@ -269,6 +269,11 @@ if ( ! class_exists( 'um\core\External_Integrations' ) ) { function get_languages_codes( $current_code = false ) { global $sitepress; + if( ! function_exists('wpml_object_id ') ) return array( + 'default' => '', + 'current' => $current + ); + $current_code = ! empty( $current_code ) ? $current_code : $sitepress->get_current_language(); $default = $sitepress->get_locale_from_language_code( $sitepress->get_default_language() ); From 856cb8492abc6e2fb0807a0cbca54b8d25f8f23c Mon Sep 17 00:00:00 2001 From: Champ Camba Date: Fri, 15 Nov 2019 21:58:32 +0800 Subject: [PATCH 3/3] Fix wpml existence validation --- includes/core/class-external-integrations.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/core/class-external-integrations.php b/includes/core/class-external-integrations.php index 0ee43631..a9b3b172 100644 --- a/includes/core/class-external-integrations.php +++ b/includes/core/class-external-integrations.php @@ -269,10 +269,8 @@ if ( ! class_exists( 'um\core\External_Integrations' ) ) { function get_languages_codes( $current_code = false ) { global $sitepress; - if( ! function_exists('wpml_object_id ') ) return array( - 'default' => '', - 'current' => $current - ); + if ( ! $this->is_wpml_active() ) + return $current_code; $current_code = ! empty( $current_code ) ? $current_code : $sitepress->get_current_language();