Changeset 21808

Timestamp:

09/11/2012 01:38:26 AM (14 years ago)

Author:

nacin

Message:

Remove 'hwstring_small' from attachment metadata and deprecate get_udims(). props SergeyBiryukov. fixes #21518.

Location:

trunk/wp-admin/includes

Files:

• deprecated.php (modified) (1 diff)
• image-edit.php (modified) (2 diffs)
• image.php (modified) (2 diffs)

trunk/wp-admin/includes/deprecated.php

@@ -53 +53 @@
         _deprecated_function( __FUNCTION__, '3.0', 'wp_constrain_dimensions()' );
         return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+}
+
+/**
+ * Calculated the new dimensions for a downsampled image.
+ *
+ * @since 2.0.0
+ * @deprecated 3.5.0
+ * @see wp_constrain_dimensions()
+ *
+ * @param int $width Current width of the image
+ * @param int $height Current height of the image
+ * @return mixed Array(height,width) of shrunk dimensions.
+ */
+function get_udims( $width, $height ) {
+        _deprecated_function( __FUNCTION__, '3.5', 'wp_constrain_dimensions()' );
+        return wp_constrain_dimensions( $width, $height, 128, 96 );
 }
 

trunk/wp-admin/includes/image-edit.php

@@ -415 +415 @@
                 $meta['width'] = $data['width'];
                 $meta['height'] = $data['height'];
-                list ( $uwidth, $uheight ) = wp_constrain_dimensions($meta['width'], $meta['height'], 128, 96);
-                $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
         }
 
@@ -560 +558 @@
                 $meta['height'] = imagesy($img);
 
-                list ( $uwidth, $uheight ) = wp_constrain_dimensions($meta['width'], $meta['height'], 128, 96);
-                $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
-
                 if ( $success && ('nothumb' == $target || 'all' == $target) ) {
                         $sizes = get_intermediate_image_sizes();

trunk/wp-admin/includes/image.php

@@ -118 +118 @@
                 $metadata['width'] = $imagesize[0];
                 $metadata['height'] = $imagesize[1];
-                list($uwidth, $uheight) = wp_constrain_dimensions($metadata['width'], $metadata['height'], 128, 96);
-                $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
 
                 // Make the file path relative to the upload dir
@@ -159 +157 @@
 
         return apply_filters( 'wp_generate_attachment_metadata', $metadata, $attachment_id );
-}
-
-/**
- * Calculated the new dimensions for a downsampled image.
- *
- * @since 2.0.0
- * @see wp_constrain_dimensions()
- *
- * @param int $width Current width of the image
- * @param int $height Current height of the image
- * @return mixed Array(height,width) of shrunk dimensions.
- */
-function get_udims( $width, $height) {
-        return wp_constrain_dimensions( $width, $height, 128, 96 );
 }