sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix image_resize() dependencies by moving wp_load_image() from admin includes to wp-includes. Fixes #7279

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13860 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2010-03-28 03:39:00 +00:00
parent 724ae803d8
commit c552d48674
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-admin/includes/image.php
View File

@ -137,34 +137,6 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
return apply_filters( 'wp_generate_attachment_metadata', $metadata, $attachment_id );
}
/**
* Load an image from a string, if PHP supports it.
*
* @since 2.1.0
*
* @param string $file Filename of the image to load.
* @return resource The resulting image resource on success, Error string on failure.
*/
function wp_load_image( $file ) {
if ( is_numeric( $file ) )
$file = get_attached_file( $file );
if ( ! file_exists( $file ) )
return sprintf(__('File “%s” doesn’t exist?'), $file);
if ( ! function_exists('imagecreatefromstring') )
return __('The GD image library is not installed.');
// Set artificially high because GD uses uncompressed images in memory
@ini_set('memory_limit', '256M');
$image = imagecreatefromstring( file_get_contents( $file ) );
if ( !is_resource( $image ) )
return sprintf(__('File “%s” is not an image.'), $file);
return $image;
}
/**
* Calculated the new dimentions for a downsampled image.
*

28
wp-includes/media.php
View File

@ -230,6 +230,34 @@ function get_image_tag($id, $alt, $title, $align, $size='medium') {
return $html;
}
/**
* Load an image from a string, if PHP supports it.
*
* @since 2.1.0
*
* @param string $file Filename of the image to load.
* @return resource The resulting image resource on success, Error string on failure.
*/
function wp_load_image( $file ) {
if ( is_numeric( $file ) )
$file = get_attached_file( $file );
if ( ! file_exists( $file ) )
return sprintf(__('File “%s” doesn’t exist?'), $file);
if ( ! function_exists('imagecreatefromstring') )
return __('The GD image library is not installed.');
// Set artificially high because GD uses uncompressed images in memory
@ini_set('memory_limit', '256M');
$image = imagecreatefromstring( file_get_contents( $file ) );
if ( !is_resource( $image ) )
return sprintf(__('File “%s” is not an image.'), $file);
return $image;
}
/**
* Calculates the new dimentions for a downsampled image.
*