- Fixed "get_profile_photo_size" function (avoid PHP notice with array_combine )

- Fixed password reset/change form when other forms are initialized at the same page
  - Fixed getting extension updates on multisites
  - Deprecated JS event 'um_before_modal_removed', use wp.hooks action 'um_before_modal_removed' instead
This commit is contained in:
nikitasinelnikov
2020-07-06 14:20:29 +03:00
parent af4a53a9fb
commit 2dad3d2704
11 changed files with 73 additions and 31 deletions
+13 -9
View File
@@ -1274,19 +1274,23 @@ if ( ! class_exists( 'um\core\Files' ) ) {
function get_profile_photo_size( $type ) {
$sizes = UM()->options()->get( $type );
$sizes = array_combine( $sizes, $sizes );
if ( ! empty( $sizes ) && is_array( $sizes ) ) {
$sizes = array_combine( $sizes, $sizes );
if ( $type == 'cover_thumb_sizes' ) {
foreach ( $sizes as $key => $value ) {
$sizes[ $key ] = $value . 'px';
}
} elseif ( $type == 'photo_thumb_sizes' ) {
foreach ( $sizes as $key => $value ) {
$sizes[ $key ] = $value . 'x' . $value . 'px';
if ( $type == 'cover_thumb_sizes' ) {
foreach ( $sizes as $key => $value ) {
$sizes[ $key ] = $value . 'px';
}
} elseif ( $type == 'photo_thumb_sizes' ) {
foreach ( $sizes as $key => $value ) {
$sizes[ $key ] = $value . 'x' . $value . 'px';
}
}
} else {
$sizes = array();
$sizes['original'] = __( 'Original size', 'ultimate-member' );
}
$sizes['original'] = __( 'Original size', 'ultimate-member' );
return $sizes;
}