From 8b09a914950743da08666ebb8f8b81e6a01f0104 Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Thu, 4 Oct 2018 18:46:03 +0300 Subject: [PATCH] - fixed submitted info; - fixed approve user notification; --- includes/core/class-user.php | 10 ++++++---- includes/core/um-filters-fields.php | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/includes/core/class-user.php b/includes/core/class-user.php index f8b58e98..30ab7290 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -1214,12 +1214,14 @@ if ( ! class_exists( 'um\core\User' ) ) { ?> * */ - function approve() { + function approve( $repeat = true ) { $user_id = um_user('ID'); - $status = get_user_meta( $user_id, 'account_status', true ); - if ( 'approved' === $status ) { - return; + if ( ! $repeat ) { + $status = get_user_meta( $user_id, 'account_status', true ); + if ( 'approved' === $status ) { + return; + } } delete_option( "um_cache_userdata_{$user_id}" ); diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php index 9f422e20..d0018551 100644 --- a/includes/core/um-filters-fields.php +++ b/includes/core/um-filters-fields.php @@ -672,8 +672,10 @@ add_filter( 'um_profile_field_filter_hook__','um_profile_field_filter_xss_valida * @return mixed */ function um_submit_form_data_trim_fields( $post_form, $mode ) { - foreach ( $post_form as &$field ) { - $field = trim( $field ); + foreach ( $post_form as $key => $field ) { + if ( is_string( $field ) ) { + $post_form[ $key ] = trim( $field ); + } } return $post_form;