<!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>[60196] branches/6.8/tests/phpunit/tests/rest-api/rest-attachments-controller.php: Media: Don't try to resize image formats which can't be resized</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/60196">60196</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/60196","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-04-28 15:55:35 +0000 (Mon, 28 Apr 2025)</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'>Media: Don't try to resize image formats which can't be resized
While having a mime type with an "image" prefix, SVG images are in fact "Scalable Vector Graphics" that can be scaled directly.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/60084">[60084]</a>.
Reviewed by desrosj.
Backports <a href="https://core.trac.wordpress.org/changeset/60195">[60195]</a> to the 6.8 branch.
Props sirlouen, adamsilverstein, audrasjb, pbiron, sainathpoojary, dilipbheda, pratiklondhe.
Fixes <a href="https://core.trac.wordpress.org/ticket/63302">#63302</a>. See <a href="https://core.trac.wordpress.org/ticket/61167">#61167</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches68srcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp">branches/6.8/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php</a></li>
<li><a href="#branches68testsphpunittestsrestapirestattachmentscontrollerphp">branches/6.8/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches68">branches/6.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.8
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.8 2025-04-28 15:37:27 UTC (rev 60195)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.8 2025-04-28 15:55:35 UTC (rev 60196)
</ins><a id="branches68"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/6.7:59437
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:60098,60104,60107,60113-60114,60120-60121,60123-60124,60127-60128,60134,60136,60141-60142,60149-60150,60154,60158-60160,60170,60173,60182-60183,60186,60193
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:60098,60104,60107,60113-60114,60120-60121,60123-60124,60127-60128,60134,60136,60141-60142,60149-60150,60154,60158-60160,60170,60173,60182-60183,60186,60193,60195
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches68srcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.8/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.8/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php 2025-04-28 15:37:27 UTC (rev 60195)
+++ branches/6.8/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php 2025-04-28 15:55:35 UTC (rev 60196)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,8 +155,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $files['file']['type'] ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> str_starts_with( $files['file']['type'], 'image/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if the image editor supports the type.
- if ( ! wp_image_editor_supports( array( 'mime_type' => $files['file']['type'] ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // List of non-resizable image formats.
+ $editor_non_resizable_formats = array(
+ 'image/svg+xml',
+ );
+
+ // Check if the image editor supports the type or ignore if it isn't a format resizable by an editor.
+ if (
+ ! in_array( $files['file']['type'], $editor_non_resizable_formats, true ) &&
+ ! wp_image_editor_supports( array( 'mime_type' => $files['file']['type'] ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_upload_image_type_not_supported',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The web server cannot generate responsive image sizes for this image. Convert it to JPEG or PNG before uploading.' ),
</span></span></pre></div>
<a id="branches68testsphpunittestsrestapirestattachmentscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.8/tests/phpunit/tests/rest-api/rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.8/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2025-04-28 15:37:27 UTC (rev 60195)
+++ branches/6.8/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2025-04-28 15:55:35 UTC (rev 60196)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,6 +33,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private static $test_avif_file;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var string The path to the SVG test image.
+ */
+ private static $test_svg_file;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @var array The recorded posts query clauses.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected $posts_clauses;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,6 +120,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_avif_file, self::$test_avif_file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_svg_file = DIR_TESTDATA . '/uploads/video-play.svg';
+ self::$test_svg_file = get_temp_dir() . 'video-play.svg';
+ if ( ! file_exists( self::$test_svg_file ) ) {
+ copy( $test_svg_file, self::$test_svg_file );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'rest_pre_dispatch', array( $this, 'wpSetUpBeforeRequest' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'posts_clauses', array( $this, 'save_posts_clauses' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2603,4 +2614,30 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 201, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Test that uploading an SVG image doesn't throw a `rest_upload_image_type_not_supported` error.
+ *
+ * @ticket 63302
+ */
+ public function test_upload_svg_image() {
+ wp_set_current_user( self::$editor_id );
+ $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+ $request->set_header( 'Content-Type', 'image/svg+xml' );
+ $request->set_file_params(
+ array(
+ 'file' => array(
+ 'file' => file_get_contents( self::$test_svg_file ),
+ 'name' => 'video-play.svg',
+ 'size' => filesize( self::$test_svg_file ),
+ 'tmp_name' => self::$test_svg_file,
+ 'type' => 'image/svg+xml',
+ ),
+ )
+ );
+ $rest_controller = new WP_REST_Attachments_Controller( 'attachment' );
+ $result = $rest_controller->create_item_permissions_check( $request );
+
+ $this->assertTrue( $result );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>