10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/clean_update_plugins_cache

Browse Source
This commit is contained in:
denisbaranov
2019-11-15 18:33:04 +02:00
parent c4f4db7960 856cb8492a
commit 9bf6ea3ddf
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-builtin.php
+1
View File
@@ -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');
includes/core/class-external-integrations.php
+3
View File
@@ -269,6 +269,9 @@ if ( ! class_exists( 'um\core\External_Integrations' ) ) {
function get_languages_codes( $current_code = false ) {
global $sitepress;
if ( ! $this->is_wpml_active() )
return $current_code;
$current_code = ! empty( $current_code ) ? $current_code : $sitepress->get_current_language();
$default = $sitepress->get_locale_from_language_code( $sitepress->get_default_language() );
includes/core/um-actions-form.php
+11
View File
@@ -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':