Update 1.2.98

This commit is contained in:
ultimatemember
2015-05-18 14:12:50 +03:00
parent 722367a11c
commit 1c4ca1802c
28 changed files with 485 additions and 51 deletions
+12 -1
View File
@@ -41,6 +41,8 @@ class UM_User {
add_action('um_after_user_account_updated', array(&$this, 'remove_cache') );
add_action('personal_options_update', array(&$this, 'remove_cache') );
add_action('edit_user_profile_update', array(&$this, 'remove_cache') );
add_action('um_when_role_is_set', array(&$this, 'remove_cache') );
add_action('um_when_status_is_set', array(&$this, 'remove_cache') );
}
@@ -71,8 +73,10 @@ class UM_User {
function get_cached_data( $user_id ) {
$find_user = get_option("um_cache_userdata_{$user_id}");
if ( $find_user )
if ( $find_user ) {
$find_user = apply_filters('um_user_permissions_filter', $find_user, $user_id);
return $find_user;
}
}
function setup_cache( $user_id, $profile ) {
@@ -333,6 +337,8 @@ class UM_User {
*
*/
function set_role( $role ){
do_action('um_when_role_is_set', um_user('ID') );
do_action('um_before_user_role_is_changed');
@@ -350,6 +356,8 @@ class UM_User {
***/
function set_status( $status ){
do_action( 'um_when_status_is_set', um_user('ID') );
$this->profile['account_status'] = $status;
$this->update_usermeta_info('account_status');
@@ -419,6 +427,9 @@ class UM_User {
function approve(){
global $ultimatemember;
$user_id = um_user('ID');
delete_option( "um_cache_userdata_{$user_id}" );
if ( um_user('account_status') == 'awaiting_admin_review' ) {
$email_tpl = 'approved_email';
} else {