WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use get_intermediate_image_sizes() in image edit functions. props mau, fixes #17475. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-10-18 20:33:34 +00:00
parent 89c0895887
commit 0b9a1f68da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/image-edit.php
View File

@ -431,7 +431,7 @@ function wp_restore_image($post_id) {
$parts = pathinfo($file); $parts = pathinfo($file);
$suffix = time() . rand(100, 999); $suffix = time() . rand(100, 999);
$default_sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') ); $default_sizes = get_intermediate_image_sizes();
if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) { if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
$data = $backup_sizes['full-orig']; $data = $backup_sizes['full-orig'];
@ -603,7 +603,7 @@ function wp_save_image($post_id) {
$meta['hwstring_small'] = "height='$uheight' width='$uwidth'"; $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
if ( $success && ('nothumb' == $target || 'all' == $target) ) { if ( $success && ('nothumb' == $target || 'all' == $target) ) {
$sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') ); $sizes = get_intermediate_image_sizes();
if ( 'nothumb' == $target ) if ( 'nothumb' == $target )
$sizes = array_diff( $sizes, array('thumbnail') ); $sizes = array_diff( $sizes, array('thumbnail') );
} }