Changeset 7149

Timestamp:

03/04/08 04:21:37 (10 months ago)

Author:

matt

Message:

New functions for attachment image display, fixes #6086. Hat tip: tellyworth.

Files:

• trunk/wp-admin/includes/schema.php (modified) (1 diff)
• trunk/wp-includes/media.php (modified) (2 diffs)
• trunk/wp-includes/post-template.php (modified) (5 diffs)

trunk/wp-admin/includes/schema.php

@@ -248 +248 @@
-    add_option('thumbnail_size_h', 150);
-    add_option('thumbnail_crop', 1);
-''
-''
+300
+300
-    add_option('autosave_interval', 60);
-

trunk/wp-includes/media.php

@@ -19 +19 @@
-        $max_height = intval(get_option('medium_size_h'));
-        // if no width is set, default to the theme content width if available
-        if ( !$max_width ) {
-            // $content_width might be set in the current theme's functions.php
-            if ( !empty($GLOBALS['content_width']) ) {
-                $max_width = $GLOBALS['content_width'];
-            }
-            else
-                $max_width = 500;
-        }
-    }
-    else { // $size == 'full'
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -259 +257 @@
-}
-
+// 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') {
+    
+    // get a thumbnail or intermediate image if there is one
+    $image = image_downsize($attachment_id, $size);
+    if ( $image ) {
+        list ( $src, $width, $height ) = $image;
+    }
+    elseif ( $src = wp_mime_type_icon($attachment_id) ) {
+        $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
+        $src_file = $icon_dir . '/' . basename($src);
+        @list($width, $height) = getimagesize($src_file);
+    }
+    
+    if ( $src && $width && $height )
+        return array( $src, $width, $height );
+    return false;
+}
+
+// as per wp_get_attachment_image_src, but returns an <img> tag
+function wp_get_attachment_image($attachment_id, $size='thumbnail') {
+
+    $html = '';
+    $image = wp_get_attachment_image_src($attachment_id, $size);
+    if ( $image ) {
+        list($src, $width, $height) = $image;
+        $hwstring = image_hwstring($width, $height);
+        $html = '<img src="'.attribute_escape($src).'" '.$hwstring.'class="attachment-'.attribute_escape($size).'" />';
+    }
+    
+    return $html;
+}
-
-?>

trunk/wp-includes/post-template.php

@@ -363 +363 @@
-//
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
-    $id = (int) $id;
@@ -383 +407 @@
-}
-
+
+// deprecated: use wp_get_attachment_image_src()
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
-    $id = (int) $id;
@@ -414 +440 @@
-}
-
+// deprecated: use wp_get_attachment_image()
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
-    $id = (int) $id;
-    if ( !$post = & get_post($id) )
-        return false;
-
+
-    if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-        return false;
@@ -457 +484 @@
-}
-
+// deprecated: use wp_get_attachment_image()
-function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-    $id = (int) $id;
@@ -473 +501 @@
-function prepend_attachment($content) {
-    $p = '<p class="attachment">';
-
+
+
-    $p .= '</p>';
-    $p = apply_filters('prepend_attachment', $p);