diff --git a/assets/js/um-profile.js b/assets/js/um-profile.js index 60a7861c..624639cb 100644 --- a/assets/js/um-profile.js +++ b/assets/js/um-profile.js @@ -54,13 +54,11 @@ jQuery(document).ready(function() { }); jQuery(document).on('click', '.um-reset-cover-photo', function(e){ - + var obj = jQuery(this); jQuery('.um-cover-overlay').hide(); - jQuery('.um-cover-e').html(''); - jQuery('.um-dropdown').hide(); - + um_responsive(); user_id = jQuery(this).attr('data-user_id'); @@ -72,6 +70,9 @@ jQuery(document).ready(function() { data: { metakey: metakey, user_id: user_id + }, + success: function( response ) { + obj.hide(); } }); diff --git a/includes/core/class-files.php b/includes/core/class-files.php index ef95ee4b..33fbc707 100644 --- a/includes/core/class-files.php +++ b/includes/core/class-files.php @@ -847,7 +847,7 @@ if ( ! class_exists( 'um\core\Files' ) ) { */ do_action( "um_after_remove_{$type}", $user_id ); - $dir = $this->upload_basedir . $user_id . '/'; + $dir = $this->upload_basedir . $user_id . DIRECTORY_SEPARATOR; $prefix = $type; chdir($dir); $matches = glob($prefix.'*',GLOB_MARK); @@ -862,6 +862,7 @@ if ( ! class_exists( 'um\core\Files' ) ) { rmdir( $dir ); } + UM()->user()->remove_cache( $user_id ); } diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php index a7467ca3..e8027661 100644 --- a/includes/core/um-actions-profile.php +++ b/includes/core/um-actions-profile.php @@ -546,14 +546,15 @@ function um_profile_header_cover_area( $args ) { do_action( 'um_cover_area_content', um_profile_id() ); if ( UM()->fields()->editing ) { + $hide_remove = um_profile( 'cover_photo' ) ? false : ' style="display:none;"'; + $items = array( '' . __( 'Change cover photo', 'ultimate-member' ) . '', - '' . __( 'Remove', 'ultimate-member' ) . '', + '' . __( 'Remove', 'ultimate-member' ) . '', '' . __( 'Cancel', 'ultimate-member' ) . '', ); - echo UM()->profile()->new_ui( 'bc', 'div.um-cover', 'click', $items ); - + UM()->profile()->new_ui( 'bc', 'div.um-cover', 'click', $items ); } UM()->fields()->add_hidden_field( 'cover_photo' );