<!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>[23096] trunk/wp-includes/media.php: Present the correct downsized image dimensions in the Media modal when inserting.</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/23096">23096</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2012-12-06 06:25:39 +0000 (Thu, 06 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Present the correct downsized image dimensions in the Media modal when inserting. Introduces a context parameter for image_constrain_size_for_editor() instead of relying on is_admin(). props jond3r, nacin. fixes <a href="http://core.trac.wordpress.org/ticket/22738">#22738</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 (23095 => 23096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-12-06 05:52:19 UTC (rev 23095)
+++ trunk/wp-includes/media.php 2012-12-06 06:25:39 UTC (rev 23096)
</span><span class="lines">@@ -29,11 +29,15 @@
</span><span class="cx"> * @param int $width Width of the image
</span><span class="cx"> * @param int $height Height of the image
</span><span class="cx"> * @param string|array $size Size of what the result image should be.
</span><ins>+ * @param context Could be 'display' (like in a theme) or 'edit' (like inserting into a neditor)
</ins><span class="cx"> * @return array Width and height of what the result image should resize to.
</span><span class="cx"> */
</span><del>-function image_constrain_size_for_editor($width, $height, $size = 'medium') {
</del><ins>+function image_constrain_size_for_editor($width, $height, $size = 'medium', $context = null ) {
</ins><span class="cx"> global $content_width, $_wp_additional_image_sizes;
</span><span class="cx">
</span><ins>+ if ( ! $context )
+ $context = is_admin() ? 'edit' : 'display';
+
</ins><span class="cx"> if ( is_array($size) ) {
</span><span class="cx"> $max_width = $size[0];
</span><span class="cx"> $max_height = $size[1];
</span><span class="lines">@@ -64,7 +68,7 @@
</span><span class="cx"> } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
</span><span class="cx"> $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
</span><span class="cx"> $max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
</span><del>- if ( intval($content_width) > 0 && is_admin() ) // Only in admin. Assume that theme authors know what they're doing.
</del><ins>+ if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
</ins><span class="cx"> $max_width = min( intval($content_width), $max_width );
</span><span class="cx"> }
</span><span class="cx"> // $size == 'full' has no constraint
</span><span class="lines">@@ -73,7 +77,7 @@
</span><span class="cx"> $max_height = $height;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- list( $max_width, $max_height ) = apply_filters( 'editor_max_image_size', array( $max_width, $max_height ), $size );
</del><ins>+ list( $max_width, $max_height ) = apply_filters( 'editor_max_image_size', array( $max_width, $max_height ), $size, $context );
</ins><span class="cx">
</span><span class="cx"> return wp_constrain_dimensions( $width, $height, $max_width, $max_height );
</span><span class="cx"> }
</span><span class="lines">@@ -1378,11 +1382,21 @@
</span><span class="cx">
</span><span class="cx"> // Nothing from the filter, so consult image metadata if we have it.
</span><span class="cx"> $size_meta = $meta['sizes'][ $size ];
</span><ins>+
+ // We have the actual image size, but might need to further constrain it if content_width is narrower.
+ // This is not necessary for thumbnails and medium size.
+ if ( 'thumbnail' == $size || 'medium' == $size ) {
+ $width = $size_meta['width'];
+ $height = $size_meta['height'];
+ } else {
+ list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
+ }
+
</ins><span class="cx"> $sizes[ $size ] = array(
</span><del>- 'height' => $size_meta['height'],
- 'width' => $size_meta['width'],
</del><ins>+ 'height' => $height,
+ 'width' => $width,
</ins><span class="cx"> 'url' => $base_url . $size_meta['file'],
</span><del>- 'orientation' => $size_meta['height'] > $size_meta['width'] ? 'portrait' : 'landscape',
</del><ins>+ 'orientation' => $height > $width ? 'portrait' : 'landscape',
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>