Changeset 9847 for trunk/wp-includes/media.php

Timestamp:

11/23/2008 06:37:15 AM (17 years ago)

Author:

azaozz

Message:

Gallery settings for TinyMCE

File:

• trunk/wp-includes/media.php (modified) (5 diffs)

trunk/wp-includes/media.php

@@ -523 +523 @@
  * @param string $size Optional, default is 'thumbnail'.
  * @param bool $icon Optional, default is false. Whether it is an icon.
+ * @param int $imgwidth Override image width.
  * @return string HTML img element or empty string on failure.
  */
-function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false) {
+function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $imgwidth = false) {
 
     $html = '';
@@ -531 +532 @@
     if ( $image ) {
         list($src, $width, $height) = $image;
-        $hwstring = image_hwstring($width, $height);
+        $hwstring = $imgwidth ? image_hwstring($imgwidth, '') : image_hwstring($width, $height);
         if ( is_array($size) )
             $size = join('x', $size);
@@ -619 +620 @@
         'columns'    => 3,
         'size'       => 'thumbnail',
+        'imgwidth'   => ''
     ), $attr));
 
@@ -638 +640 @@
     $columns = intval($columns);
     $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
+    $imgwidth = isset($imgwidth) && (int) $imgwidth ? $imgwidth : false;
 
     $output = apply_filters('gallery_style', "
@@ -661 +664 @@
     $i = 0;
     foreach ( $attachments as $id => $attachment ) {
-        $link = wp_get_attachment_link($id, $size, true);
+        $link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false, $imgwidth) : wp_get_attachment_link($id, $size, true, false, $imgwidth);
+
         $output .= "<{$itemtag} class='gallery-item'>";
         $output .= "