From a793be201b9c23dbe8b90a6ecd53ab52336f0f91 Mon Sep 17 00:00:00 2001
From: Peter Wilson <wilson@peterwilson.cc>
Date: Wed, 9 Mar 2022 00:48:05 +0000
Subject: [PATCH] Media: Revert query string support for `wp_check_filetype()`.

Revert [52829] due to fatal errors in some Multisite configurations.

Props dd32, SergeyBiryukov, audrasjb.
See #30377.


Built from https://develop.svn.wordpress.org/trunk@52832


git-svn-id: http://core.svn.wordpress.org/trunk@52421 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 12 +-----------
 wp-includes/version.php   |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 676eacbe38..82b19ec8f1 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2981,9 +2981,8 @@ function wp_get_default_extension_for_mime_type( $mime_type ) {
  * You can optionally define the mime array, if needed.
  *
  * @since 2.0.4
- * @since 6.0.0 URLs are now supported.
  *
- * @param string   $filename File name, path, or URL.
+ * @param string   $filename File name or path.
  * @param string[] $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
  * @return array {
  *     Values for the extension and mime type.
@@ -2999,15 +2998,6 @@ function wp_check_filetype( $filename, $mimes = null ) {
 	$type = false;
 	$ext  = false;
 
-	// 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 );
-
 	foreach ( $mimes as $ext_preg => $mime_match ) {
 		$ext_preg = '!\.(' . $ext_preg . ')$!i';
 		if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index edfbd080d9..e8f73d2c9c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-52831';
+$wp_version = '6.0-alpha-52832';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.