10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development/2.3.3' of https://github.com/ultimatemember/ultimatemember into development/2.3.3

Browse Source
This commit is contained in:
Nikita Sinelnikov
2022-05-24 18:30:01 +03:00
parent 9cdf65973c dfbbebdbfe
commit b13e063f95
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-enqueue.php
+1 -1
View File
@@ -657,7 +657,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
global $wp_version, $current_screen;
if ( version_compare( $wp_version, '5.0', '>=' ) ) {
if ( $current_screen->is_block_editor() ) {
if ( isset( $current_screen ) && $current_screen->is_block_editor() ) {
$this->load_gutenberg_js();
$this->load_gutenberg_shortcode_blocks();
}
includes/core/class-uploader.php
+2 -2
View File
@@ -383,7 +383,7 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
?>
*/
$movefile = apply_filters( 'um_upload_image_result', $movefile, $user_id, $field_data );
/**
* Resize and compress images uploaded by the field "Image Upload" without crop.
* Resize and compress images uploaded on Activity wall and Group Discussion wall.
@@ -1361,7 +1361,7 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
}
}
$files = glob( UM()->uploader()->get_upload_base_dir() . $user_id . DIRECTORY_SEPARATOR . '*', GLOB_BRACE );
$files = glob( UM()->uploader()->get_upload_base_dir() . $user_id . DIRECTORY_SEPARATOR . '*' );
if ( ! empty( $files ) ) {
foreach ( $files as $file ) {
$str = basename( $file );