Ticket #23843: 23843.2.diff

wp-includes/media.php

@@ -875 +875 @@
         }
 
         if ( ! $primary ) {
-                $audios = get_attached_audio( $post_id );
+                $audios = get_attached_media( 'audio', $post_id );
                 if ( empty( $audios ) )
                         return;
 
@@ -993 +993 @@
         }
 
         if ( ! $primary ) {
-                $videos = get_attached_video( $post_id );
+                $videos = get_attached_media( 'video', $post_id );
                 if ( empty( $videos ) )
                         return;
 
@@ -1870 +1870 @@
 }
 
 /**
- * Retrieve audio attached to the passed post
- *
- * @since 3.6.0
- *
- * @param int $post_id  Post ID
- * @return array Found audio attachments
- */
-function get_attached_audio( $post_id = 0 ) {
-        return get_attached_media( 'audio', $post_id );
-}
-
-/**
- * Retrieve video attached to the passed post
- *
- * @since 3.6.0
- *
- * @param int $post_id  Post ID
- * @return array Found video attachments
- */
-function get_attached_video( $post_id = 0 ) {
-        return get_attached_media( 'video', $post_id );
-}
-
-/**
  * Extract and parse {media type} shortcodes or srcs from the passed content
  *
  * @since 3.6.0
@@ -2121 +2097 @@
  * @param int $post_id Optional. Post ID.
  * @return array Found image attachments
  */
-function get_attached_images( $post_id = 0 ) {
-        return get_attached_media( 'image', $post_id );
-}
-
-/**
- * Retrieve images attached to the passed post
- *
- * @since 3.6.0
- *
- * @param int $post_id Optional. Post ID.
- * @return array Found image attachments
- */
 function get_attached_image_srcs( $post_id = 0 ) {
-        $children = get_attached_images( $post_id );
+        $children = get_attached_media( 'image', $post_id );
         if ( empty( $children ) )
                 return array();
 
@@ -2385 +2349 @@
         $matched = false;
         $link_fmt = '%s';
 
-        $medias = get_attached_images( $post->ID );
+        $medias = get_attached_media( 'image', $post->ID );
         if ( ! empty( $medias ) ) {
                 $media = reset( $medias );
                 $sizes = get_intermediate_image_sizes();