10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-13 19:56:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1568 from ultimatemember/development/2.8.x

Browse Source 
Version 2.8.9 hotfix
This commit is contained in:
Mykyta Synelnikov
2024-10-14 17:24:50 +03:00
committed by GitHub
parent 0b3b758b11 3b7550d757
commit 0a03ebf499
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog.txt
+1
View File
@@ -17,6 +17,7 @@
- Fixed: Rollback using `<iframe>` for displaying HTML formatted textarea value
- Fixed: Capability to edit user profile for Administrator when user doesn't have a capability to edit its profile
- Fixed: Sending email notifications based on user status after registration
- Fixed: PHP error when meta `um_member_directory_data` has a wrong format
* Cached and optimized/minified assets(JS/CSS) must be flushed/re-generated after upgrade
includes/admin/core/class-admin-settings.php
+2 -2
View File
@@ -2781,7 +2781,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
if ( ! empty( $results ) ) {
foreach ( $results as $user_id ) {
$md_data = get_user_meta( $user_id, 'um_member_directory_data', true );
if ( ! empty( $md_data ) ) {
if ( ! empty( $md_data ) && is_array( $md_data ) ) {
$md_data['profile_photo'] = ! empty( $_POST['um_options']['use_gravatars'] );
update_user_meta( $user_id, 'um_member_directory_data', $md_data );
}
@@ -2831,7 +2831,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
if ( ! empty( $results ) ) {
foreach ( $results as $user_id ) {
$md_data = get_user_meta( $user_id, 'um_member_directory_data', true );
if ( ! empty( $md_data ) ) {
if ( ! empty( $md_data ) && is_array( $md_data ) ) {
$md_data['hide_in_members'] = ( $_POST['um_options']['account_hide_in_directory_default'] === 'No' ) ? false : true;
update_user_meta( $user_id, 'um_member_directory_data', $md_data );
}
includes/core/class-user.php
+8 -10
View File
@@ -417,7 +417,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
}
}
/**
* When you delete usermeta connected with member directory - reset it to default value
*
@@ -426,7 +425,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
* @param string $meta_key
* @param mixed $_meta_value
*/
function on_delete_usermeta( $meta_ids, $object_id, $meta_key, $_meta_value ) {
public function on_delete_usermeta( $meta_ids, $object_id, $meta_key, $_meta_value ) {
if ( $this->deleted_user_id ) {
return;
}
@@ -436,8 +435,9 @@ if ( ! class_exists( 'um\core\User' ) ) {
return;
}
// Set default if empty or has a wrong format.
$md_data = get_user_meta( $object_id, 'um_member_directory_data', true );
if ( empty( $md_data ) ) {
if ( empty( $md_data ) || ! is_array( $md_data ) ) {
$md_data = array(
'account_status' => 'approved',
'hide_in_members' => UM()->member_directory()->get_hide_in_members_default(),
@@ -494,7 +494,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
update_user_meta( $object_id, 'um_member_directory_data', $md_data );
}
/**
* When you add/update usermeta connected with member directories - set this data to member directory metakey
*
@@ -503,15 +502,15 @@ if ( ! class_exists( 'um\core\User' ) ) {
* @param string $meta_key
* @param mixed $_meta_value
*/
function on_update_usermeta( $meta_id, $object_id, $meta_key, $_meta_value ) {
public function on_update_usermeta( $meta_id, $object_id, $meta_key, $_meta_value ) {
$metakeys = array( 'account_status', 'hide_in_members', 'synced_gravatar_hashed_id', 'synced_profile_photo', 'profile_photo', 'cover_photo', '_um_verified' );
if ( ! in_array( $meta_key, $metakeys, true ) ) {
return;
}
// Set default if empty or has a wrong format.
$md_data = get_user_meta( $object_id, 'um_member_directory_data', true );
if ( empty( $md_data ) ) {
if ( empty( $md_data ) || ! is_array( $md_data ) ) {
$md_data = array(
'account_status' => 'approved',
'hide_in_members' => UM()->member_directory()->get_hide_in_members_default(),
@@ -528,7 +527,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
case 'hide_in_members':
$hide_in_members = UM()->member_directory()->get_hide_in_members_default();
if ( ! empty( $_meta_value ) ) {
if ( $_meta_value == 'Yes' || $_meta_value == __( 'Yes', 'ultimate-member' ) ||
if ( 'Yes' === $_meta_value || __( 'Yes', 'ultimate-member' ) === $_meta_value ||
array_intersect( array( 'Yes', __( 'Yes', 'ultimate-member' ) ), $_meta_value ) ) {
$hide_in_members = true;
} else {
@@ -557,14 +556,13 @@ if ( ! class_exists( 'um\core\User' ) ) {
$md_data['cover_photo'] = ! empty( $_meta_value );
break;
case '_um_verified':
$md_data['verified'] = $_meta_value == 'verified' ? true : false;
$md_data['verified'] = 'verified' === $_meta_value;
break;
}
update_user_meta( $object_id, 'um_member_directory_data', $md_data );
}
/**
* @param $user_id
*/
readme.txt
+1
View File
@@ -183,6 +183,7 @@ IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSI
* Fixed: Rollback using `<iframe>` for displaying HTML formatted textarea value
* Fixed: Capability to edit user profile for Administrator when user doesn't have a capability to edit its profile
* Fixed: Sending email notifications based on user status after registration
* Fixed: PHP error when meta `um_member_directory_data` has a wrong format
**Cached and optimized/minified assets(JS/CSS) must be flushed/re-generated after upgrade**