<!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>[46809] trunk/src/wp-admin/includes/image.php: Upload: Exclude PNG images from scaling after uploading.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/46809">46809</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46809","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-12-01 18:24:30 +0000 (Sun, 01 Dec 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Upload: Exclude PNG images from scaling after uploading. Fixes a case where resizing a very large PNG may create a scaled image that has smaller dimensions but larger file size than the original.
Fixes <a href="https://core.trac.wordpress.org/ticket/48736">#48736</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2019-12-01 12:11:57 UTC (rev 46808)
+++ trunk/src/wp-admin/includes/image.php 2019-12-01 18:24:30 UTC (rev 46809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,93 +244,97 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta['image_meta'] = $exif_meta;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the "BIG image" threshold value.
- *
- * If the original image width or height is above the threshold, it will be scaled down. The threshold is
- * used as max width and max height. The scaled down image will be used as the largest available size, including
- * the `_wp_attached_file` post meta value.
- *
- * Returning `false` from the filter callback will disable the scaling.
- *
- * @since 5.3.0
- *
- * @param int $threshold The threshold value in pixels. Default 2560.
- * @param array $imagesize {
- * Indexed array of the image width and height in pixels.
- *
- * @type int $0 The image width.
- * @type int $1 The image height.
- * }
- * @param string $file Full path to the uploaded image file.
- * @param int $attachment_id Attachment post ID.
- */
- $threshold = (int) apply_filters( 'big_image_size_threshold', 2560, $imagesize, $file, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not scale (large) PNG images. May result in sub-sizes that have greater file size than the original. See #48736.
+ if ( $imagesize['mime'] !== 'image/png' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the original image's dimensions are over the threshold, scale the image
- // and use it as the "full" size.
- if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
- $editor = wp_get_image_editor( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the "BIG image" threshold value.
+ *
+ * If the original image width or height is above the threshold, it will be scaled down. The threshold is
+ * used as max width and max height. The scaled down image will be used as the largest available size, including
+ * the `_wp_attached_file` post meta value.
+ *
+ * Returning `false` from the filter callback will disable the scaling.
+ *
+ * @since 5.3.0
+ *
+ * @param int $threshold The threshold value in pixels. Default 2560.
+ * @param array $imagesize {
+ * Indexed array of the image width and height in pixels.
+ *
+ * @type int $0 The image width.
+ * @type int $1 The image height.
+ * }
+ * @param string $file Full path to the uploaded image file.
+ * @param int $attachment_id Attachment post ID.
+ */
+ $threshold = (int) apply_filters( 'big_image_size_threshold', 2560, $imagesize, $file, $attachment_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $editor ) ) {
- // This image cannot be edited.
- return $image_meta;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the original image's dimensions are over the threshold, scale the image
+ // and use it as the "full" size.
+ if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
+ $editor = wp_get_image_editor( $file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Resize the image
- $resized = $editor->resize( $threshold, $threshold );
- $rotated = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $editor ) ) {
+ // This image cannot be edited.
+ return $image_meta;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If there is EXIF data, rotate according to EXIF Orientation.
- if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) {
- $resized = $editor->maybe_exif_rotate();
- $rotated = $resized;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Resize the image
+ $resized = $editor->resize( $threshold, $threshold );
+ $rotated = null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_wp_error( $resized ) ) {
- // Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
- // This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
- $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there is EXIF data, rotate according to EXIF Orientation.
+ if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) {
+ $resized = $editor->maybe_exif_rotate();
+ $rotated = $resized;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_wp_error( $saved ) ) {
- $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_wp_error( $resized ) ) {
+ // Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
+ // This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
+ $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the image was rotated update the stored EXIF data.
- if ( true === $rotated && ! empty( $image_meta['image_meta']['orientation'] ) ) {
- $image_meta['image_meta']['orientation'] = 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_wp_error( $saved ) ) {
+ $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
+
+ // If the image was rotated update the stored EXIF data.
+ if ( true === $rotated && ! empty( $image_meta['image_meta']['orientation'] ) ) {
+ $image_meta['image_meta']['orientation'] = 1;
+ }
+ } else {
+ // TODO: log errors.
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: log errors.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- // TODO: log errors.
- }
- } elseif ( ! empty( $exif_meta['orientation'] ) && (int) $exif_meta['orientation'] !== 1 ) {
- // Rotate the whole original image if there is EXIF data and "orientation" is not 1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $exif_meta['orientation'] ) && (int) $exif_meta['orientation'] !== 1 ) {
+ // Rotate the whole original image if there is EXIF data and "orientation" is not 1.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = wp_get_image_editor( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = wp_get_image_editor( $file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $editor ) ) {
- // This image cannot be edited.
- return $image_meta;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $editor ) ) {
+ // This image cannot be edited.
+ return $image_meta;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Rotate the image
- $rotated = $editor->maybe_exif_rotate();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Rotate the image
+ $rotated = $editor->maybe_exif_rotate();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( true === $rotated ) {
- // Append `-rotated` to the image file name.
- $saved = $editor->save( $editor->generate_filename( 'rotated' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === $rotated ) {
+ // Append `-rotated` to the image file name.
+ $saved = $editor->save( $editor->generate_filename( 'rotated' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_wp_error( $saved ) ) {
- $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_wp_error( $saved ) ) {
+ $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Update the stored EXIF data.
- if ( ! empty( $image_meta['image_meta']['orientation'] ) ) {
- $image_meta['image_meta']['orientation'] = 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update the stored EXIF data.
+ if ( ! empty( $image_meta['image_meta']['orientation'] ) ) {
+ $image_meta['image_meta']['orientation'] = 1;
+ }
+ } else {
+ // TODO: log errors.
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- // TODO: log errors.
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>