Remove mime type additions for later.

peterwilsoncc · peterwilsoncc · commit 66a940a1dbc3 · 2022-04-26T11:05:16.000+10:00
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
@@ -3520,7 +3520,6 @@ function wp_filesize( $path ) {
  * Retrieve list of allowed mime types and file extensions.
  *
  * @since 2.8.6
- * @since 6.0.0 Removes web font from allowed mime types for uploads.
  *
  * @param int|WP_User $user Optional. User to check. Defaults to current user.
  * @return string[] Array of mime types keyed by the file extension regex corresponding
@@ -3530,8 +3529,6 @@ function get_allowed_mime_types( $user = null ) {
 	$t = wp_get_mime_types();
 
 	unset( $t['swf'], $t['exe'] );
-	// Remove web font mime types for uploads.
-	unset( $t['woff2'], $t['woff'], $t['ttf'], $t['eot'], $t['otf'] );
 
 	if ( function_exists( 'current_user_can' ) ) {
 		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
@@ -3519,27 +3519,7 @@ function _wp_theme_json_webfonts_handler() {
 		wp_add_inline_style( 'wp-block-library', $styles );
 	};
 
-	/**
-	 * Adds webfonts mime types.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $mime_types Array of mime types.
-	 * @return array Mime types with webfonts formats.
-	 */
-	$fn_add_mime_types = static function( $mime_types ) {
-		// Webfonts formats.
-		$mime_types['woff2'] = 'font/woff2';
-		$mime_types['woff']  = 'font/woff';
-		$mime_types['ttf']   = 'font/ttf';
-		$mime_types['eot']   = 'application/vnd.ms-fontobject';
-		$mime_types['otf']   = 'application/x-font-opentype';
-
-		return $mime_types;
-	};
-
 	add_action( 'wp_loaded', $fn_register_webfonts );
 	add_action( 'wp_enqueue_scripts', $fn_generate_and_enqueue_styles );
 	add_action( 'admin_init', $fn_generate_and_enqueue_editor_styles );
-	add_filter( 'mime_types', $fn_add_mime_types );
 }
diff --git a/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php b/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php
@@ -96,17 +96,4 @@ public function test_font_face_generated_from_themejson() {
 			get_echo( 'wp_print_styles' )
 		);
 	}
-
-	/**
-	 * @ticket 55567
-	 * @ticket 46370
-	 */
-	public function test_mime_types_added() {
-		$actual = wp_get_mime_types();
-
-		$this->assertArrayHasKey( 'woff2', $actual, 'woff2 mime type is expected to be added' );
-		$this->assertArrayHasKey( 'woff', $actual, 'woff mime type is expected to be added' );
-		$this->assertArrayHasKey( 'ttf', $actual, 'ttf mime type is expected to be added' );
-		$this->assertArrayHasKey( 'otf', $actual, 'otf mime type is expected to be added' );
-	}
 }

Original file line number	Diff line number	Diff line change
`@@ -3520,7 +3520,6 @@ function wp_filesize( $path ) {`
`3520`	`3520`	`* Retrieve list of allowed mime types and file extensions.`
`3521`	`3521`	`*`
`3522`	`3522`	`* @since 2.8.6`
`3523`		`- * @since 6.0.0 Removes web font from allowed mime types for uploads.`
`3524`	`3523`	`*`
`3525`	`3524`	`* @param int\|WP_User $user Optional. User to check. Defaults to current user.`
`3526`	`3525`	`* @return string[] Array of mime types keyed by the file extension regex corresponding`
`@@ -3530,8 +3529,6 @@ function get_allowed_mime_types( $user = null ) {`
`3530`	`3529`	`$t = wp_get_mime_types();`
`3531`	`3530`
`3532`	`3531`	`unset( $t['swf'], $t['exe'] );`
`3533`		`- // Remove web font mime types for uploads.`
`3534`		`- unset( $t['woff2'], $t['woff'], $t['ttf'], $t['eot'], $t['otf'] );`
`3535`	`3532`
`3536`	`3533`	`if ( function_exists( 'current_user_can' ) ) {`
`3537`	`3534`	`$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );`