<!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" />
<title>[24055] trunk/wp-includes: Image editors: multi_resize() should require height and width.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24055">24055</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-04-22 20:28:05 +0000 (Mon, 22 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Image editors: multi_resize() should require height and width. Crop is now optional and defaults to false. props DH-Shredder. fixes <a href="http://core.trac.wordpress.org/ticket/23884">#23884</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpimageeditorgdphp">trunk/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#trunkwpincludesclasswpimageeditorimagickphp">trunk/wp-includes/class-wp-image-editor-imagick.php</a></li>
<li><a href="#trunkwpincludesclasswpimageeditorphp">trunk/wp-includes/class-wp-image-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpimageeditorgdphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-image-editor-gd.php (24054 => 24055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-image-editor-gd.php 2013-04-22 20:24:41 UTC (rev 24054)
+++ trunk/wp-includes/class-wp-image-editor-gd.php 2013-04-22 20:28:05 UTC (rev 24055)
</span><span class="lines">@@ -178,10 +178,13 @@
</span><span class="cx"> * Processes current image and saves to disk
</span><span class="cx"> * multiple sizes from single source.
</span><span class="cx"> *
</span><ins>+ * 'width' and 'height' are required.
+ * 'crop' defaults to false when not provided.
+ *
</ins><span class="cx"> * @since 3.5.0
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><del>- * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
</del><ins>+ * @param array $sizes { {'width'=>int, 'height'=>int, ['crop'=>bool]}, ... }
</ins><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> public function multi_resize( $sizes ) {
</span><span class="lines">@@ -189,6 +192,12 @@
</span><span class="cx"> $orig_size = $this->size;
</span><span class="cx">
</span><span class="cx"> foreach ( $sizes as $size => $size_data ) {
</span><ins>+ if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+ continue;
+
+ if ( ! isset( $size_data['crop'] ) )
+ $size_data['crop'] = false;
+
</ins><span class="cx"> $image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
</span><span class="cx">
</span><span class="cx"> if( ! is_wp_error( $image ) ) {
</span></span></pre></div>
<a id="trunkwpincludesclasswpimageeditorimagickphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-image-editor-imagick.php (24054 => 24055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-image-editor-imagick.php 2013-04-22 20:24:41 UTC (rev 24054)
+++ trunk/wp-includes/class-wp-image-editor-imagick.php 2013-04-22 20:28:05 UTC (rev 24055)
</span><span class="lines">@@ -245,10 +245,13 @@
</span><span class="cx"> * Processes current image and saves to disk
</span><span class="cx"> * multiple sizes from single source.
</span><span class="cx"> *
</span><ins>+ * 'width' and 'height' are required.
+ * 'crop' defaults to false when not provided.
+ *
</ins><span class="cx"> * @since 3.5.0
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><del>- * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
</del><ins>+ * @param array $sizes { {'width'=>int, 'height'=>int, ['crop'=>bool]}, ... }
</ins><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> public function multi_resize( $sizes ) {
</span><span class="lines">@@ -260,6 +263,12 @@
</span><span class="cx"> if ( ! $this->image )
</span><span class="cx"> $this->image = $orig_image->getImage();
</span><span class="cx">
</span><ins>+ if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+ continue;
+
+ if ( ! isset( $size_data['crop'] ) )
+ $size_data['crop'] = false;
+
</ins><span class="cx"> $resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
</span><span class="cx">
</span><span class="cx"> if( ! is_wp_error( $resize_result ) ) {
</span></span></pre></div>
<a id="trunkwpincludesclasswpimageeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-image-editor.php (24054 => 24055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-image-editor.php 2013-04-22 20:24:41 UTC (rev 24054)
+++ trunk/wp-includes/class-wp-image-editor.php 2013-04-22 20:28:05 UTC (rev 24055)
</span><span class="lines">@@ -97,11 +97,14 @@
</span><span class="cx"> * Processes current image and saves to disk
</span><span class="cx"> * multiple sizes from single source.
</span><span class="cx"> *
</span><ins>+ * 'width' and 'height' are required.
+ * 'crop' defaults to false when not provided.
+ *
</ins><span class="cx"> * @since 3.5.0
</span><span class="cx"> * @access public
</span><span class="cx"> * @abstract
</span><span class="cx"> *
</span><del>- * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
</del><ins>+ * @param array $sizes { {'width'=>int, 'height'=>int, ['crop'=>bool]}, ... }
</ins><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> abstract public function multi_resize( $sizes );
</span></span></pre>
</div>
</div>
</body>
</html>