<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12823] trunk: Deprecate wp_shrink_dimension(), add wp-admin/includes/
deprecated.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12823">12823</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-25 18:50:01 +0000 (Mon, 25 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate wp_shrink_dimension(), add wp-admin/includes/deprecated.php. Props filosofo. fixes <a href="http://trac.wordpress.org/ticket/11967">#11967</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesadminphp">trunk/wp-admin/includes/admin.php</a></li>
<li><a href="#trunkwpadminincludesimageeditphp">trunk/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/admin.php (12822 => 12823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/admin.php 2010-01-25 18:37:05 UTC (rev 12822)
+++ trunk/wp-admin/includes/admin.php 2010-01-25 18:50:01 UTC (rev 12823)
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx"> /** WordPress Registration API */
</span><span class="cx"> require_once(ABSPATH . WPINC . '/registration.php');
</span><span class="cx">
</span><ins>+/** WordPress Deprecated Administration API */
+require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
+
</ins><span class="cx"> /** WordPress Multi-Site support API */
</span><span class="cx"> if ( is_multisite() )
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/includes/ms.php');
</span></span></pre></div>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/includes/deprecated.php (0 => 12823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php (rev 0)
+++ trunk/wp-admin/includes/deprecated.php 2010-01-25 18:50:01 UTC (rev 12823)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<?php
+
+/**
+ * Calculates the new dimentions for a downsampled image.
+ *
+ * @since 2.0.0
+ * @deprecated 3.0.0
+ * @deprecated Use 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 ) {
+ _deprecated_function( __FUNCTION__, '3.0', 'wp_constrain_dimensions()' );
+ return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-admin/includes/deprecated.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (12822 => 12823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php 2010-01-25 18:37:05 UTC (rev 12822)
+++ trunk/wp-admin/includes/image-edit.php 2010-01-25 18:50:01 UTC (rev 12823)
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> $meta['file'] = _wp_relative_upload_path( $restored_file );
</span><span class="cx"> $meta['width'] = $data['width'];
</span><span class="cx"> $meta['height'] = $data['height'];
</span><del>- list ( $uwidth, $uheight ) = wp_shrink_dimensions($meta['width'], $meta['height']);
</del><ins>+ list ( $uwidth, $uheight ) = wp_constrain_dimensions($meta['width'], $meta['height'], 128, 96);
</ins><span class="cx"> $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> $meta['width'] = imagesx($img);
</span><span class="cx"> $meta['height'] = imagesy($img);
</span><span class="cx">
</span><del>- list ( $uwidth, $uheight ) = wp_shrink_dimensions($meta['width'], $meta['height']);
</del><ins>+ list ( $uwidth, $uheight ) = wp_constrain_dimensions($meta['width'], $meta['height'], 128, 96);
</ins><span class="cx"> $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
</span><span class="cx">
</span><span class="cx"> if ( $success && ('nothumb' == $target || 'all' == $target) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (12822 => 12823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2010-01-25 18:37:05 UTC (rev 12822)
+++ trunk/wp-admin/includes/image.php 2010-01-25 18:50:01 UTC (rev 12823)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> $imagesize = getimagesize( $file );
</span><span class="cx"> $metadata['width'] = $imagesize[0];
</span><span class="cx"> $metadata['height'] = $imagesize[1];
</span><del>- list($uwidth, $uheight) = wp_shrink_dimensions($metadata['width'], $metadata['height']);
</del><ins>+ list($uwidth, $uheight) = wp_constrain_dimensions($metadata['width'], $metadata['height'], 128, 96);
</ins><span class="cx"> $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
</span><span class="cx">
</span><span class="cx"> // Make the file path relative to the upload dir
</span><span class="lines">@@ -169,33 +169,17 @@
</span><span class="cx"> * Calculated the new dimentions for a downsampled image.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><del>- * @see wp_shrink_dimensions()
</del><ins>+ * @see wp_constrain_dimensions()
</ins><span class="cx"> *
</span><span class="cx"> * @param int $width Current width of the image
</span><span class="cx"> * @param int $height Current height of the image
</span><span class="cx"> * @return mixed Array(height,width) of shrunk dimensions.
</span><span class="cx"> */
</span><span class="cx"> function get_udims( $width, $height) {
</span><del>- return wp_shrink_dimensions( $width, $height );
</del><ins>+ return wp_constrain_dimensions( $width, $height, 128, 96 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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 );
-}
-
-/**
</del><span class="cx"> * Convert a fraction string to a decimal.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (12822 => 12823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-01-25 18:37:05 UTC (rev 12822)
+++ trunk/wp-includes/media.php 2010-01-25 18:50:01 UTC (rev 12823)
</span><span class="lines">@@ -233,8 +233,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Calculates the new dimentions for a downsampled image.
</span><span class="cx"> *
</span><del>- * Same as {@link wp_shrink_dimensions()}, except the max parameters are
- * optional. If either width or height are empty, no constraint is applied on
</del><ins>+ * If either width or height are empty, no constraint is applied on
</ins><span class="cx"> * that dimension.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span></span></pre>
</div>
</div>
</body>
</html>