Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-27 07:14:57 +02:00
Code Issues Projects Releases Wiki Activity

Image fixes from andy. see #5911

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@7263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-03-12 08:10:00 +00:00
parent 3d0435bb58
commit 31abda9e0f
4 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/edit-attachment-rows.php
View File

@ -39,7 +39,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
case 'icon': case 'icon':
?> ?>
<td class="media-icon"><?php echo get_the_attachment_link($post->ID, false, array(48,48)); ?></td> <td class="media-icon"><?php echo wp_get_attachment_link($post->ID, array(60, 40), false, true); ?></td>
<?php <?php
// TODO // TODO
break; break;

5
wp-admin/user-edit.php
View File

@ -157,8 +157,11 @@ include ('admin-header.php');
<th scope="row"><?php _e('Admin Color Scheme')?></th> <th scope="row"><?php _e('Admin Color Scheme')?></th>
<td> <td>
<?php <?php
$current_color = get_user_option('admin_color');
if ( empty($current_color) )
$current_color = 'classic';
foreach ( $_wp_admin_css_colors as $color => $color_info ): ?> foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
<label class="color-option"><input name="admin_color" type="radio" value="<?php echo $color ?>" class="tog" <?php checked($color, get_user_option('admin_color')); ?> /> <label class="color-option"><input name="admin_color" type="radio" value="<?php echo $color ?>" class="tog" <?php checked($color, $current_color); ?> />
<table class="color-palette"> <table class="color-palette">
<tr> <tr>
<?php <?php

52
wp-includes/media.php
View File

@ -5,7 +5,11 @@
// scale down the default size of an image so it's a better fit for the editor and theme // scale down the default size of an image so it's a better fit for the editor and theme
function image_constrain_size_for_editor($width, $height, $size = 'medium') { function image_constrain_size_for_editor($width, $height, $size = 'medium') {
if ( $size == 'thumb' ) { if ( is_array($size) ) {
$max_width = $size[0];
$max_height = $size[1];
}
elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
$max_width = intval(get_option('thumbnail_size_w')); $max_width = intval(get_option('thumbnail_size_w'));
$max_height = intval(get_option('thumbnail_size_h')); $max_height = intval(get_option('thumbnail_size_h'));
// last chance thumbnail size defaults // last chance thumbnail size defaults
@ -75,7 +79,7 @@ function image_downsize($id, $size = 'medium') {
$height = $info[1]; $height = $info[1];
} }
} }
elseif ( isset($meta['width'], $meta['height']) ) { if ( !$width && !$height && isset($meta['width'], $meta['height']) ) {
// any other type: use the real image and constrain it // any other type: use the real image and constrain it
list( $width, $height ) = image_constrain_size_for_editor( $meta['width'], $meta['height'], $size ); list( $width, $height ) = image_constrain_size_for_editor( $meta['width'], $meta['height'], $size );
} }
@ -250,8 +254,34 @@ function image_make_intermediate_size($file, $width, $height, $crop=false) {
function image_get_intermediate_size($post_id, $size='thumbnail') { function image_get_intermediate_size($post_id, $size='thumbnail') {
if ( !$imagedata = wp_get_attachment_metadata( $post_id ) ) if ( !$imagedata = wp_get_attachment_metadata( $post_id ) )
return false; return false;
if ( empty($imagedata['sizes'][$size]) ) // get the best one for a specified set of dimensions
if ( is_array($size) && !empty($imagedata['sizes']) ) {
foreach ( $imagedata['sizes'] as $_size => $data ) {
// already cropped to width or height; so use this size
if ( ( $data['width'] == $size[0] && $data['height'] <= $size[1] ) || ( $data['height'] == $size[1] && $data['width'] <= $size[0] ) ) {
$file = $data['file'];
list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
return compact( 'file', 'width', 'height' );
}
// add to lookup table: area => size
$areas[$data['width'] * $data['height']] = $_size;
}
if ( !$size || !empty($areas) ) {
// find for the smallest image not smaller than the desired size
ksort($areas);
foreach ( $areas as $_size ) {
$data = $imagedata['sizes'][$_size];
if ( $data['width'] >= $size[0] || $data['height'] >= $size[1] ) {
$file = $data['file'];
list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
return compact( 'file', 'width', 'height' );
}
}
}
}
if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
return false; return false;
return $imagedata['sizes'][$size]; return $imagedata['sizes'][$size];
@ -259,13 +289,13 @@ function image_get_intermediate_size($post_id, $size='thumbnail') {
// get an image to represent an attachment - a mime icon for files, thumbnail or intermediate size for images // get an image to represent an attachment - a mime icon for files, thumbnail or intermediate size for images
// returns an array (url, width, height), or false if no image is available // returns an array (url, width, height), or false if no image is available
function wp_get_attachment_image_src($attachment_id, $size='thumbnail') { function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon = false) {
// get a thumbnail or intermediate image if there is one // get a thumbnail or intermediate image if there is one
if ( $image = image_downsize($attachment_id, $size) ) if ( $image = image_downsize($attachment_id, $size) )
return $image; return $image;
if ( $src = wp_mime_type_icon($attachment_id) ) { if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' ); $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
$src_file = $icon_dir . '/' . basename($src); $src_file = $icon_dir . '/' . basename($src);
@list($width, $height) = getimagesize($src_file); @list($width, $height) = getimagesize($src_file);
@ -276,13 +306,15 @@ function wp_get_attachment_image_src($attachment_id, $size='thumbnail') {
} }
// as per wp_get_attachment_image_src, but returns an <img> tag // as per wp_get_attachment_image_src, but returns an <img> tag
function wp_get_attachment_image($attachment_id, $size='thumbnail') { function wp_get_attachment_image($attachment_id, $size='thumbnail', $icon = false) {
$html = ''; $html = '';
$image = wp_get_attachment_image_src($attachment_id, $size); $image = wp_get_attachment_image_src($attachment_id, $size, $icon);
if ( $image ) { if ( $image ) {
list($src, $width, $height) = $image; list($src, $width, $height) = $image;
$hwstring = image_hwstring($width, $height); $hwstring = image_hwstring($width, $height);
if ( is_array($size) )
$size = join('x', $size);
$html = '<img src="'.attribute_escape($src).'" '.$hwstring.'class="attachment-'.attribute_escape($size).'" />'; $html = '<img src="'.attribute_escape($src).'" '.$hwstring.'class="attachment-'.attribute_escape($size).'" />';
} }
@ -322,7 +354,7 @@ function gallery_shortcode($attr) {
<div class='gallery'>"); <div class='gallery'>");
foreach ( $attachments as $id => $attachment ) { foreach ( $attachments as $id => $attachment ) {
$link = get_the_attachment_link($id, false, array(128, 96), true); $link = wp_get_attachment_link($id, 'thumbnail', true);
$output .= " $output .= "
<div> <div>
$link $link
@ -358,7 +390,7 @@ function adjacent_image_link($prev = true) {
$k = $prev ? $k - 1 : $k + 1; $k = $prev ? $k - 1 : $k + 1;
if ( isset($attachments[$k]) ) if ( isset($attachments[$k]) )
echo get_the_attachment_link($attachments[$k]->ID, true, array(128, 96), true); echo wp_get_attachment_link($attachments[$k]->ID, 'thumbnail', true);
} }
?> ?>

4
wp-includes/post-template.php
View File

@ -370,7 +370,7 @@ function the_attachment_link($id = 0, $fullsize = false, $deprecated = false, $p
} }
// get an attachment page link using an image or icon if possible // get an attachment page link using an image or icon if possible
function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false) { function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false) {
$_post = & get_post( intval($id) ); $_post = & get_post( intval($id) );
if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) ) if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
@ -381,7 +381,7 @@ function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false
$post_title = attribute_escape($_post->post_title); $post_title = attribute_escape($_post->post_title);
$link_text = wp_get_attachment_image($id, $size); $link_text = wp_get_attachment_image($id, $size, $icon);
if ( !$link_text ) if ( !$link_text )
$link_text = $_post->post_title; $link_text = $_post->post_title;