Changeset 7150

Show
Ignore:
Timestamp:
03/04/08 04:23:35 (9 months ago)
Author:
matt
Message:

Handle GD errors correctly during image resizing. Fixes #6087. Hat tip: tellyworth.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/media.php

    r7149 r7150  
    236236    if ( $width || $height ) { 
    237237        $resized_file = image_resize($file, $width, $height, $crop); 
    238         if ( $resized_file && $info = getimagesize($resized_file) ) { 
     238        if ( !is_wp_error($resized_file) && $resized_file && $info = getimagesize($resized_file) ) { 
    239239            return array( 
    240240                'file' => basename( $resized_file ),