WordPress.org

Make WordPress Core

Changeset 20019


Ignore:
Timestamp:
02/28/12 20:02:43 (6 years ago)
Author:
duck_
Message:

Drop image resizing code from wp_handle_upload(). Fixes #19800.

This code stops wp_handle_upload() from reporting errors when the upload couldn't be moved to its final local and it was a non-JS fallback that is unused.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/file.php

    r19712 r20019  
    324324    $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); 
    325325 
    326     $tmp_file = wp_tempnam($filename); 
    327  
    328326    // Move the file to the uploads dir 
    329     if ( false === @ move_uploaded_file( $file['tmp_name'], $tmp_file ) ) 
     327    $new_file = $uploads['path'] . "/$filename"; 
     328    if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) 
    330329        return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) ); 
    331  
    332     // If a resize was requested, perform the resize. 
    333     $image_resize = isset( $_POST['image_resize'] ) && 'true' == $_POST['image_resize']; 
    334     $do_resize = apply_filters( 'wp_upload_resize', $image_resize ); 
    335     $size = @getimagesize( $tmp_file ); 
    336     if ( $do_resize && $size ) { 
    337         $old_temp = $tmp_file; 
    338         $tmp_file = image_resize( $tmp_file, (int) get_option('large_size_w'), (int) get_option('large_size_h'), 0, 'resized'); 
    339         if ( ! is_wp_error($tmp_file) ) { 
    340             unlink($old_temp); 
    341         } else { 
    342             $tmp_file = $old_temp; 
    343         } 
    344     } 
    345  
    346     // Copy the temporary file into its destination 
    347     $new_file = $uploads['path'] . "/$filename"; 
    348     copy( $tmp_file, $new_file ); 
    349     unlink($tmp_file); 
    350330 
    351331    // Set correct file permissions 
Note: See TracChangeset for help on using the changeset viewer.