diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-16 21:27:04 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-16 21:27:04 +0000 |
commit | 72e9496bfc2f7a962cf4f428ccab25c7a0175aaa (patch) | |
tree | af3e2ca7136c77140d9e9201e3f495a4b8e7a6da /wp-admin/admin-functions.php | |
parent | 04b67169db33e30f5ca63dbbafe551fdc6fb2164 (diff) | |
download | wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.tar.gz wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.tar.xz wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.zip |
WP Merge to rev 4753
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@849 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
-rw-r--r-- | wp-admin/admin-functions.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 7a33aca..4f90c28 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -2090,11 +2090,11 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'"; $metadata['file'] = $file; - if ( $metadata['width'] * $metadata['height'] < 3 * 1024 * 1024 ) { - if ( $metadata['width'] > 128 && $metadata['width'] >= $metadata['height'] * 4 / 3 ) - $thumb = wp_create_thumbnail($file, 128); - elseif ( $metadata['height'] > 96 ) - $thumb = wp_create_thumbnail($file, 96); + $max = apply_filters( 'wp_thumbnail_creation_size_limit', 3 * 1024 * 1024, $attachment_id, $file ); + + if ( $max > 0 && $metadata['width'] * $metadata['height'] < $max ) { + $max_side = apply_filters( 'wp_thumbnail_max_side_length', 128, $attachment_id, $file ); + $thumb = wp_create_thumbnail( $file, $max_side ); if ( @file_exists($thumb) ) $metadata['thumb'] = basename($thumb); |