Changeset 12823

Timestamp:

01/25/2010 06:50:01 PM (15 years ago)

Author:

ryan

Message:

Deprecate wp_shrink_dimension(), add wp-admin/includes/deprecated.php. Props filosofo. fixes #11967

Location:

trunk

Files:

• wp-admin/includes/admin.php (modified) (1 diff)
• wp-admin/includes/deprecated.php (added)
• wp-admin/includes/image-edit.php (modified) (2 diffs)
• wp-admin/includes/image.php (modified) (3 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/admin.php

@@ -52 +52 @@
 require_once(ABSPATH . WPINC . '/registration.php');
 
+/** WordPress Deprecated Administration API */
+require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
+
 /** WordPress Multi-Site support API */
 if ( is_multisite() )

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

@@ -454 +454 @@
         $meta['width'] = $data['width'];
         $meta['height'] = $data['height'];
-        list ( $uwidth, $uheight ) = wp_shrink_dimensions($meta['width'], $meta['height']);
+        list ( $uwidth, $uheight ) = wp_constrain_dimensions($meta['width'], $meta['height'], 128, 96);
         $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
     }
@@ -599 +599 @@
         $meta['height'] = imagesy($img);
 
-        list ( $uwidth, $uheight ) = wp_shrink_dimensions($meta['width'], $meta['height']);
+        list ( $uwidth, $uheight ) = wp_constrain_dimensions($meta['width'], $meta['height'], 128, 96);
         $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
 

trunk/wp-admin/includes/image.php

@@ -95 +95 @@
         $metadata['width'] = $imagesize[0];
         $metadata['height'] = $imagesize[1];
-        list($uwidth, $uheight) = wp_shrink_dimensions($metadata['width'], $metadata['height']);
+        list($uwidth, $uheight) = wp_constrain_dimensions($metadata['width'], $metadata['height'], 128, 96);
         $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
 
@@ -170 +170 @@
  *
  * @since 2.0.0
- * @see wp_shrink_dimensions()
+ * @see wp_constrain_dimensions()
  *
  * @param int $width Current width of the image
@@ -177 +177 @@
  */
 function get_udims( $width, $height) {
-    return wp_shrink_dimensions( $width, $height );
-}
-
-/**
- * Calculates the new dimentions 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
- * @param int $wmax Maximum wanted width
- * @param int $hmax Maximum wanted height
- * @return mixed Array(height,width) of shrunk dimensions.
- */
-function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-    return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+    return wp_constrain_dimensions( $width, $height, 128, 96 );
 }
 

trunk/wp-includes/media.php

@@ -234 +234 @@
  * Calculates the new dimentions for a downsampled image.
  *
- * Same as {@link wp_shrink_dimensions()}, except the max parameters are
- * optional. If either width or height are empty, no constraint is applied on
+ * If either width or height are empty, no constraint is applied on
  * that dimension.
  *