Changeset 7263

Timestamp:

03/12/2008 08:10:00 AM (17 years ago)

Author:

ryan

Message:

Image fixes from andy. see #5911

Location:

trunk

Files:

• wp-admin/edit-attachment-rows.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/media.php (modified) (8 diffs)
• wp-includes/post-template.php (modified) (2 diffs)

trunk/wp-admin/edit-attachment-rows.php

@@ -40 +40 @@
     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
         // TODO

trunk/wp-admin/user-edit.php

@@ -158 +158 @@
 <td>
 <?php
+$current_color = get_user_option('admin_color');
+if ( empty($current_color) )
+    $current_color = 'classic';
 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">
     <tr>

trunk/wp-includes/media.php

@@ -6 +6 @@
 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_height = intval(get_option('thumbnail_size_h'));
@@ -76 +80 @@
         }
     }
-    elseif ( isset($meta['width'], $meta['height']) ) {
+    if ( !$width && !$height && isset($meta['width'], $meta['height']) ) {
         // any other type: use the real image and constrain it
         list( $width, $height ) = image_constrain_size_for_editor( $meta['width'], $meta['height'], $size );
@@ -251 +255 @@
     if ( !$imagedata = wp_get_attachment_metadata( $post_id ) )
         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;
         
@@ -260 +290 @@
 // 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
-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
@@ -266 +296 @@
         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' );
         $src_file = $icon_dir . '/' . basename($src);
@@ -277 +307 @@
 
 // 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 = '';
-    $image = wp_get_attachment_image_src($attachment_id, $size);
+    $image = wp_get_attachment_image_src($attachment_id, $size, $icon);
     if ( $image ) {
         list($src, $width, $height) = $image;
         $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).'" />';
     }
@@ -323 +355 @@
 
     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 .= "
             <div>
@@ -359 +391 @@
 
     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);
 }
 

trunk/wp-includes/post-template.php

@@ -371 +371 @@
 
 // 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) );
 
@@ -382 +382 @@
     $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 )
         $link_text = $_post->post_title;