From 2e939caf04eafb3a3ce8c4651744eecf001655fa Mon Sep 17 00:00:00 2001 From: nikitasinelnikov Date: Wed, 27 Mar 2019 19:15:14 +0200 Subject: [PATCH] - 2.0.41 release; --- includes/admin/core/class-admin-settings.php | 1 - includes/core/class-fields.php | 17 +++++----- languages/ultimate-member-en_US.po | 34 ++++++++++---------- readme.txt | 1 + 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index a62636a5..4654db7d 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -2292,7 +2292,6 @@ Use Gravatars: info_value( UM()->options()->get('use_grava options()->get('use_gravatars') ): ?>Gravatar builtin image: options()->get('use_um_gravatar_default_builtin_image') . "\n"; ?> UM Avatar as blank Gravatar: info_value( UM()->options()->get('use_um_gravatar_default_image'), 'yesno', true ); ?> Require a strong password: info_value( UM()->options()->get('reset_require_strongpass'), 'onoff', true ); ?> -Editable primary email field in profile view: info_value( UM()->options()->get('editable_primary_email_in_profile'), 'onoff', true ); ?> --- UM Access Configuration --- diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php index 7463d537..6c76519b 100644 --- a/includes/core/class-fields.php +++ b/includes/core/class-fields.php @@ -1676,25 +1676,26 @@ if ( ! class_exists( 'um\core\Fields' ) ) { $disabled = ''; } } - } if ( ! isset( $data['autocomplete'] ) ) { $autocomplete = 'off'; } + um_fetch_user( get_current_user_id() ); - if (!um_can_view_field( $data )) return; - if (!um_can_edit_field( $data )) return; + if ( ! um_can_view_field( $data ) ) { + return; + } + if ( ! um_can_edit_field( $data ) ) { + return; + } um_fetch_user( $_um_profile_id ); // fields that need to be disabled in edit mode (profile) $arr_restricted_fields = array( 'user_email', 'username', 'user_login', 'user_password' ); + $arr_restricted_fields = apply_filters( 'um_user_profile_restricted_edit_fields', $arr_restricted_fields, $key, $data, $_um_profile_id ); - if ( UM()->options()->get( 'editable_primary_email_in_profile' ) == 1 ) { - unset( $arr_restricted_fields[0] ); // remove user_email - } - - if (in_array( $key, $arr_restricted_fields ) && $this->editing == true && $this->set_mode == 'profile') { + if ( in_array( $key, $arr_restricted_fields ) && $this->editing == true && $this->set_mode == 'profile' ) { return; } diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po index 62f420b1..17bdd384 100644 --- a/languages/ultimate-member-en_US.po +++ b/languages/ultimate-member-en_US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Ultimate Member\n" -"POT-Creation-Date: 2019-03-27 10:29+0200\n" -"PO-Revision-Date: 2019-03-27 10:29+0200\n" +"POT-Creation-Date: 2019-03-27 19:13+0200\n" +"PO-Revision-Date: 2019-03-27 19:13+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en_US\n" @@ -103,7 +103,7 @@ msgstr "" #: includes/admin/core/class-admin-builder.php:767 #: includes/admin/core/class-admin-dragdrop.php:32 #: includes/admin/core/class-admin-menu.php:104 -#: includes/core/class-fields.php:4099 +#: includes/core/class-fields.php:4100 msgid "Please login as administrator" msgstr "" @@ -2584,7 +2584,7 @@ msgid "UM Action" msgstr "" #: includes/admin/core/class-admin-users.php:116 -#: includes/core/class-fields.php:2313 +#: includes/core/class-fields.php:2314 msgid "Apply" msgstr "" @@ -3553,7 +3553,7 @@ msgstr "" #: includes/admin/templates/modal/dynamic_new_group.php:15 #: includes/admin/templates/modal/fonticons.php:11 #: includes/admin/templates/role/publish.php:24 -#: includes/core/class-fields.php:2314 includes/core/class-fields.php:2411 +#: includes/core/class-fields.php:2315 includes/core/class-fields.php:2412 #: includes/core/um-actions-profile.php:557 #: includes/core/um-actions-profile.php:696 #: includes/core/um-actions-profile.php:729 @@ -6290,56 +6290,56 @@ msgstr "" msgid "You can only upload one image" msgstr "" -#: includes/core/class-fields.php:1972 +#: includes/core/class-fields.php:1973 msgid "Current Password" msgstr "" -#: includes/core/class-fields.php:2001 +#: includes/core/class-fields.php:2002 msgid "New Password" msgstr "" -#: includes/core/class-fields.php:2033 +#: includes/core/class-fields.php:2034 #, php-format msgid "Confirm %s" msgstr "" -#: includes/core/class-fields.php:2268 +#: includes/core/class-fields.php:2269 msgid "Upload Photo" msgstr "" -#: includes/core/class-fields.php:2289 includes/core/class-fields.php:2313 +#: includes/core/class-fields.php:2290 includes/core/class-fields.php:2314 #: includes/core/um-actions-profile.php:727 msgid "Change photo" msgstr "" -#: includes/core/class-fields.php:2313 includes/core/class-fields.php:2410 +#: includes/core/class-fields.php:2314 includes/core/class-fields.php:2411 msgid "Processing..." msgstr "" -#: includes/core/class-fields.php:2335 +#: includes/core/class-fields.php:2336 msgid "Upload File" msgstr "" -#: includes/core/class-fields.php:2377 includes/core/um-filters-fields.php:243 +#: includes/core/class-fields.php:2378 includes/core/um-filters-fields.php:243 msgid "This file has been removed." msgstr "" -#: includes/core/class-fields.php:2380 includes/core/class-fields.php:2410 +#: includes/core/class-fields.php:2381 includes/core/class-fields.php:2411 msgid "Change file" msgstr "" -#: includes/core/class-fields.php:2410 +#: includes/core/class-fields.php:2411 msgid "Save" msgstr "" -#: includes/core/class-fields.php:3833 +#: includes/core/class-fields.php:3834 #, php-format msgid "" "Your profile is looking a little empty. Why not add some " "information!" msgstr "" -#: includes/core/class-fields.php:3835 +#: includes/core/class-fields.php:3836 msgid "This user has not added any information to their profile yet." msgstr "" diff --git a/readme.txt b/readme.txt index 5a8c77af..39a0afe6 100644 --- a/readme.txt +++ b/readme.txt @@ -155,6 +155,7 @@ The plugin works with popular caching plugins by automatically excluding Ultimat - Fixed restriction content WC Products integration - Fixed words count for French in user description field - Fixed is_selected function for dropdown/multi-select/checkbox profile fields + - Fixed disable email field at Edit Profile form via filter (disabled by default) = 2.0.40: March 12, 2019 =