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

- small fixes for file uploader;

Browse Source 
- added filter for include UM pages to conditional logic;
This commit is contained in:
nikitozzzzzzz
2018-08-07 12:38:19 +03:00
parent 06ca1cd775
commit 1a17095b24
8 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-uploader.php
+25 -12
View File
@@ -232,7 +232,10 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
/**
* Set upload directory
*
* @param array $args
*
* @return array
*/
public function set_upload_directory( $args ){
@@ -252,17 +255,20 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
return $args;
}
/**
* Upload Image files
* @param string $uploadedfile
* @param integer $user_id
* @param string $field_key
* @param string $upload_type
*
* @since 2.0.22
* @param $uploadedfile
* @param int|null $user_id
* @param string $field_key
* @param string $upload_type
*
* @since 2.0.22
*
* @return array
*/
public function upload_image( $uploadedfile, $user_id = null, $field_key = '', $upload_type = 'stream_photo' ){
public function upload_image( $uploadedfile, $user_id = null, $field_key = '', $upload_type = 'stream_photo' ) {
$response = array();
@@ -324,6 +330,8 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
$response['error'] = $movefile['error'];
}else{
$movefile['url'] = set_url_scheme( $movefile['url'] );
$movefile['file_info']['basename'] = wp_basename( $movefile['file'] );
$file_type = wp_check_filetype( $movefile['file_info']['basename'] );
@@ -336,7 +344,7 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
$movefile['file_info']['size_format'] = size_format( $movefile['file_info']['size'] );
$movefile['file'] = $movefile['file_info']['basename'];
/**
* UM hook
*
@@ -438,11 +446,14 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
/**
* Upload Files
* @param string $uploadedfile
* @param integer $user_id
* @param string $field_key
*
* @since 2.0.22
* @param $uploadedfile
* @param int|null $user_id
* @param string $field_key
*
* @since 2.0.22
*
* @return array
*/
public function upload_file( $uploadedfile, $user_id = null, $field_key = '' ){
@@ -492,6 +503,8 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
$file_type = wp_check_filetype( $movefile['file'] );
$movefile['url'] = set_url_scheme( $movefile['url'] );
$movefile['file_info']['name'] = $movefile['url'];
$movefile['file_info']['original_name'] = $uploadedfile['name'];
$movefile['file_info']['basename'] = wp_basename( $movefile['file'] );