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

- fixed upload dir on UM upload process for avoid the conflicts;

Browse Source
This commit is contained in:
nikitasinelnikov
2019-02-08 11:43:01 +02:00
parent bad51f49f6
commit 21f266f407
6 changed files with 75 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-files.php
+6
View File
@@ -281,7 +281,9 @@ if ( ! class_exists( 'um\core\Files' ) ) {
wp_send_json_error( esc_js( __( 'Invalid file ownership', 'ultimate-member' ) ) );
}
UM()->uploader()->replace_upload_dir = true;
$output = UM()->uploader()->resize_image( $image_path, $src, $key, $user_id, $coord );
UM()->uploader()->replace_upload_dir = false;
delete_option( "um_cache_userdata_{$user_id}" );
@@ -340,7 +342,9 @@ if ( ! class_exists( 'um\core\Files' ) ) {
if ( ! is_array( $_FILES[ $id ]['name'] ) ) {
UM()->uploader()->replace_upload_dir = true;
$uploaded = UM()->uploader()->upload_image( $_FILES[ $id ], $user_id, $id );
UM()->uploader()->replace_upload_dir = false;
if ( isset( $uploaded['error'] ) ){
$ret['error'] = $uploaded['error'];
} else {
@@ -416,7 +420,9 @@ if ( ! class_exists( 'um\core\Files' ) ) {
$user_id = $_POST['user_id'];
UM()->uploader()->replace_upload_dir = true;
$uploaded = UM()->uploader()->upload_file( $_FILES[ $id ], $user_id, $id );
UM()->uploader()->replace_upload_dir = false;
if ( isset( $uploaded['error'] ) ){
$ret['error'] = $uploaded['error'];
includes/core/class-uploader.php
+10 -2
View File
@@ -22,6 +22,12 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
var $user_id;
/**
* @var integer
*/
var $replace_upload_dir = false;
/**
* @var string
*/
@@ -270,8 +276,10 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
list( $this->upload_user_baseurl, $this->upload_user_basedir ) = apply_filters( 'um_change_upload_user_path', array( $this->upload_user_baseurl, $this->upload_user_basedir ), $this->field_key, $this->upload_type );
$args['path'] = $this->upload_user_basedir;
$args['url'] = $this->upload_user_baseurl;
if ( $this->replace_upload_dir ) {
$args['path'] = $this->upload_user_basedir;
$args['url'] = $this->upload_user_baseurl;
}
return $args;
}
includes/core/um-actions-profile.php
+2
View File
@@ -367,7 +367,9 @@ function um_user_edit_profile( $args ) {
$files = apply_filters( 'um_user_pre_updating_files_array', $files );
if ( ! empty( $files ) && is_array( $files ) ) {
UM()->uploader()->replace_upload_dir = true;
UM()->uploader()->move_temporary_files( um_user( 'ID' ), $files );
UM()->uploader()->replace_upload_dir = false;
}
/**
includes/core/um-actions-register.php
+2
View File
@@ -638,7 +638,9 @@ function um_registration_save_files( $user_id, $args ) {
$files = apply_filters( 'um_user_pre_updating_files_array', $files );
if ( ! empty( $files ) ) {
UM()->uploader()->replace_upload_dir = true;
UM()->uploader()->move_temporary_files( $user_id, $files );
UM()->uploader()->replace_upload_dir = false;
}
}
add_action( 'um_registration_set_extra_data', 'um_registration_save_files', 10, 2 );