Ticket #32264: 32264.6.patch

src/wp-includes/media.php

@@ -2918 +2918 @@
                 }
         }
 
-        $has_audio = $wpdb->get_var( "
-                SELECT ID
-                FROM $wpdb->posts
-                WHERE post_type = 'attachment'
-                AND post_mime_type LIKE 'audio%'
-                LIMIT 1
-        " );
-        $has_video = $wpdb->get_var( "
-                SELECT ID
-                FROM $wpdb->posts
-                WHERE post_type = 'attachment'
-                AND post_mime_type LIKE 'video%'
-                LIMIT 1
-        " );
-        $months = $wpdb->get_results( $wpdb->prepare( "
-                SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-                FROM $wpdb->posts
-                WHERE post_type = %s
-                ORDER BY post_date DESC
-        ", 'attachment' ) );
+        // Cache these expensive queries
+        $has_audio = get_transient( 'has_audio' );
+        if ( false === $has_audio ) {
+                $has_audio = $wpdb->get_var( "
+                        SELECT ID
+                        FROM $wpdb->posts
+                        WHERE post_type = 'attachment'
+                        AND post_mime_type LIKE 'audio%'
+                        LIMIT 1
+                " );
+                $has_audio = $has_audio ? 1 : 0;
+                set_transient( 'has_audio', $has_audio );
+        }
+        $has_video = get_transient( 'has_video' );
+        if ( false === $has_video ) {
+                $has_video = $wpdb->get_var( "
+                        SELECT ID
+                        FROM $wpdb->posts
+                        WHERE post_type = 'attachment'
+                        AND post_mime_type LIKE 'video%'
+                        LIMIT 1
+                " );
+                $has_video = $has_video ? 1 : 0;
+                set_transient( 'has_video', $has_video );
+        }
+        $months = get_transient( 'media_months' );
+        if ( false === $months ) {
+                $months = $wpdb->get_results( $wpdb->prepare( "
+                        SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+                        FROM $wpdb->posts
+                        WHERE post_type = %s
+                        ORDER BY post_date DESC
+                ", 'attachment' ) );
+                set_transient( 'media_months', $months );
+        }
+
         foreach ( $months as $month_year ) {
                 $month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
         }
@@ -2956 +2972 @@
                 ),
                 'defaultProps' => $props,
                 'attachmentCounts' => array(
-                        'audio' => ( $has_audio ) ? 1 : 0,
-                        'video' => ( $has_video ) ? 1 : 0
+                        'audio' => intval( $has_audio ),
+                        'video' => intval( $has_video )
                 ),
                 'embedExts'    => $exts,
                 'embedMimes'   => $ext_mimes,

src/wp-includes/post.php

@@ -3477 +3477 @@
                          */
                         do_action( 'edit_attachment', $post_ID );
                 } else {
+                        // Delete persistent cache transients set in wp_enqueue_media
+                        $mime_type_prefix = substr( $postarr['post_mime_type'], 0, 5 );
+                        if ( 'video' === $mime_type_prefix ) {
+                                delete_transient( 'has_video' );
+                        } else if ( 'audio' === $mime_type_prefix ) {
+                                delete_transient( 'has_audio' );
+                        }
 
+                        delete_transient( 'media_months' );
+
                         /**
                          * Fires once an attachment has been added.
                          *
@@ -4830 +4839 @@
         $meta = wp_get_attachment_metadata( $post_id );
         $backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
         $file = get_attached_file( $post_id );
+        $mime_type_prefix = substr( get_post_field( 'post_mime_type', $post_id ), 0, 5 );
 
         if ( is_multisite() )
                 delete_transient( 'dirsize_cache' );
@@ -4866 +4876 @@
         /** This action is documented in wp-includes/post.php */
         do_action( 'deleted_post', $post_id );
 
+        // Delete persistent cache transients set in wp_enqueue_media
+        if ( 'video' === $mime_type_prefix ) {
+                delete_transient( 'has_video' );
+        } else if ( 'audio' === $mime_type_prefix ) {
+                delete_transient( 'has_audio' );
+        }
+
+        delete_transient( 'media_months' );
+
         $uploadpath = wp_upload_dir();
 
         if ( ! empty($meta['thumb']) ) {