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

Timestamp:

11/26/2008 02:27:37 AM (18 years ago)

Author:

azaozz

Message:

Move Gallery Settings to the Gallery tab in the uploader, split the Upload tab in "From Computer" and "From URL" tabs

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, $imgwidth = false) {
+function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false) {
 
         $html = '';
@@ -532 +531 @@
         if ( $image ) {
                 list($src, $width, $height) = $image;
-                $hwstring = $imgwidth ? image_hwstring($imgwidth, '') : image_hwstring($width, $height);
+                $hwstring = image_hwstring($width, $height);
                 if ( is_array($size) )
                         $size = join('x', $size);
@@ -619 +618 @@
                 'captiontag' => 'dd',
                 'columns'    => 3,
-                'size'       => 'thumbnail',
-                'imgwidth'       => ''
+                'size'       => 'thumbnail'
         ), $attr));
 
@@ -640 +638 @@
         $columns = intval($columns);
         $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
-        $imgwidth = isset($imgwidth) && (int) $imgwidth ? $imgwidth : false;
 
         $output = apply_filters('gallery_style', "
@@ -664 +661 @@
         $i = 0;
         foreach ( $attachments as $id => $attachment ) {
-                $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);
+                $link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
 
                 $output .= "<{$itemtag} class='gallery-item'>";