<!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>[52832] trunk: Media: Revert query string support for `wp_check_filetype()`.</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/52832">52832</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/52832","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-03-09 00:46:24 +0000 (Wed, 09 Mar 2022)</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: Revert query string support for `wp_check_filetype()`.
Revert <a href="https://core.trac.wordpress.org/changeset/52829">[52829]</a> due to fatal errors in some Multisite configurations.
Props dd32, SergeyBiryukov, audrasjb.
See <a href="https://core.trac.wordpress.org/ticket/30377">#30377</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionswpCheckFiletypephp">trunk/tests/phpunit/tests/functions/wpCheckFiletype.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2022-03-08 14:49:41 UTC (rev 52831)
+++ trunk/src/wp-includes/functions.php 2022-03-09 00:46:24 UTC (rev 52832)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2981,9 +2981,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * You can optionally define the mime array, if needed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.4
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 6.0.0 URLs are now supported.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $filename File name, path, or URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $filename File name or path.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $mimes Optional. Array of allowed mime types keyed by their file extension regex.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><span class="cx" style="display: block; padding: 0 10px"> * Values for the extension and mime type.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2999,15 +2998,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Strip query args and fragment from filename to reveal extension.
- $query_pos = strpos( $filename, '?' );
-
- if ( false !== $query_pos ) {
- $filename = substr_replace( $filename, '', $query_pos );
- }
-
- $filename = strip_fragment_from_url( $filename );
-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $mimes as $ext_preg => $mime_match ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ext_preg = '!\.(' . $ext_preg . ')$!i';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpCheckFiletypephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/functions/wpCheckFiletype.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpCheckFiletype.php 2022-03-08 14:49:41 UTC (rev 52831)
+++ trunk/tests/phpunit/tests/functions/wpCheckFiletype.php 2022-03-09 00:46:24 UTC (rev 52832)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,58 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Tests for wp_check_filetype()
- *
- * @group functions.php
- * @covers ::wp_check_filetype
- */
-class Tests_Functions_wpCheckFiletype extends WP_UnitTestCase {
-
- public function data_url_filetypes() {
- return array(
- // Invalid or empty data:
- array( null, false ),
- array( '', false ),
- array( ' ', false ),
-
- // Paths:
- array( 'file.jpg', 'jpg' ),
- array( 'C:\path\to\file.mp3', 'mp3' ),
- array( 'C:\path\to\file.mp3?file.jpg', 'mp3' ),
- array( 'C:\path\to\file.exe?file.jpg', false ),
- array( '/file.jpg', 'jpg' ),
- array( '/path/to/file.jpg', 'jpg' ),
- array( '/path/to/file.jpg', 'jpg' ),
- array( '/file.exe?file.jpg', false ),
-
- // Absolute URLs:
- array( 'http://example.com', false ),
- array( 'http://example.com/', false ),
- array( 'http://example.com/wibble', false ),
- array( 'http://example.com/wibble/', false ),
- array( 'http://example.com/wibble.wobble', false ),
- array( 'http://example.com/wibble.mp3', 'mp3' ),
- array( 'http://example.com/wibble.mp3#wobble', 'mp3' ),
- array( 'http://example.com/wibble.mp3?wobble=true', 'mp3' ),
- array( 'http://example.com/wibble.mp3?wobble=true#wobble', 'mp3' ),
- array( 'http://example.mp3/', false ),
- array( 'http://example.com/file.mp3#file.jpg', 'mp3' ),
- array( 'http://example.com/file.mp3?file.jpg', 'mp3' ),
- array( 'http://example.com/file.exe#file.jpg', false ),
- array( 'http://example.com/file.exe?file.jpg', false ),
- array( 'http://example.com/file.mp3?foo=bar#?file=file.jpg', 'mp3' ),
- array( 'http://example.com?file.jpg', false ),
- );
- }
-
- /**
- * @dataProvider data_url_filetypes
- *
- * @param string $url
- * @param string|false $expected
- */
- public function test_url_ext( $url, $expected ) {
- $filetype = wp_check_filetype( $url );
- $this->assertSame( $expected, $filetype['ext'] );
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>