<!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>[15003] trunk/wp-includes/media.php: Initialize instead of using isset().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15003">15003</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-05-27 20:41:36 +0000 (Thu, 27 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Initialize instead of using isset(). props nacin. see <a href="http://trac.wordpress.org/ticket/13556">#13556</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (15002 => 15003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-05-27 20:37:42 UTC (rev 15002)
+++ trunk/wp-includes/media.php 2010-05-27 20:41:36 UTC (rev 15003)
</span><span class="lines">@@ -277,6 +277,7 @@
</span><span class="cx"> return array( $current_width, $current_height );
</span><span class="cx">
</span><span class="cx"> $width_ratio = $height_ratio = 1.0;
</span><ins>+ $did_width = $did_height = false;
</ins><span class="cx">
</span><span class="cx"> if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width ) {
</span><span class="cx"> $width_ratio = $max_width / $current_width;
</span><span class="lines">@@ -305,9 +306,9 @@
</span><span class="cx"> // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
</span><span class="cx"> // We also have issues with recursive calls resulting in an ever-changing result. Contraining to the result of a constraint should yield the original result.
</span><span class="cx"> // Thus we look for dimensions that are one pixel shy of the max value and bump them up
</span><del>- if ( isset( $did_width ) && $did_width && $w == $max_width - 1 )
</del><ins>+ if ( $did_width && $w == $max_width - 1 )
</ins><span class="cx"> $w = $max_width; // Round it up
</span><del>- if ( isset( $did_height ) && $did_height && $h == $max_height - 1 )
</del><ins>+ if ( $did_height && $h == $max_height - 1 )
</ins><span class="cx"> $h = $max_height; // Round it up
</span><span class="cx">
</span><span class="cx"> return array( $w, $h );
</span></span></pre>
</div>
</div>
</body>
</html>