Changeset 45270

Timestamp:

04/26/2019 12:43:50 AM (7 years ago)

Author:

pento

Message:

Media: Revert [44947].

get_available_post_mime_types() uses a query that's extremely slow on sites with lots of posts. The original fix can be revisited after those performance issues are tackled.

See #43658.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -3577 +3577 @@
         }
 
-        // Filter to show only available mime types.
-        $avail_post_mime_types = get_available_post_mime_types( 'attachment' );
-        $mimeTypes             = wp_list_pluck( get_post_mime_types(), 0 );
-        foreach ( $mimeTypes as $mime_type => $label ) {
-                if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
-                        unset( $mimeTypes[ $mime_type ] );
-                }
-        }
         $settings = array(
                 'tabs'             => $tabs,
                 'tabUrl'           => add_query_arg( array( 'chromeless' => true ), admin_url( 'media-upload.php' ) ),
-                'mimeTypes'        => $mimeTypes,
+                'mimeTypes'        => wp_list_pluck( get_post_mime_types(), 0 ),
                 /** This filter is documented in wp-admin/includes/media.php */
                 'captions'         => ! apply_filters( 'disable_captions', '' ),

trunk/tests/phpunit/tests/functions.php

@@ -464 +464 @@
                 $this->assertInternalType( 'array', $mimes );
                 $this->assertNotEmpty( $mimes );
-        }
-
-        /**
-         * Test that the media grid uses the correct available single media type.
-         * @ticket 43658
-         */
-        function test_wp_enqueue_media_single_mime_type() {
-                $filename      = DIR_TESTDATA . '/images/test-image.jpg';
-                $contents      = file_get_contents( $filename );
-                $upload        = wp_upload_bits( basename( $filename ), null, $contents );
-                $attachment_id = $this->_make_attachment( $upload );
-
-                add_filter(
-                        'media_view_settings',
-                        function( $settings ) {
-                                $this->assertEquals( array( 'image' ), array_keys( $settings['mimeTypes'] ) );
-                                return $settings;
-                        }
-                );
-                wp_enqueue_media();
-                remove_all_filters( 'media_view_settings' );
-        }
-
-        /**
-         * Test that the media grid uses the correct available multiple media types.
-         * @ticket 43658
-         */
-        function test_wp_enqueue_media_multiple_mime_types() {
-                $filename      = DIR_TESTDATA . '/images/test-image.jpg';
-                $contents      = file_get_contents( $filename );
-                $upload        = wp_upload_bits( basename( $filename ), null, $contents );
-                $attachment_id = $this->_make_attachment( $upload );
-
-                $filename      = DIR_TESTDATA . '/uploads/small-audio.mp3';
-                $contents      = file_get_contents( $filename );
-                $upload        = wp_upload_bits( basename( $filename ), null, $contents );
-                $attachment_id = $this->_make_attachment( $upload );
-
-                add_filter(
-                        'media_view_settings',
-                        function( $settings ) {
-                                $this->assertEquals( array( 'image', 'audio' ), array_keys( $settings['mimeTypes'] ) );
-                                return $settings;
-                        }
-                );
-                wp_enqueue_media();
-                remove_all_filters( 'media_view_settings' );
         }