Changeset 23840

Timestamp:

03/28/2013 07:28:27 AM (12 years ago)

Author:

markjaquith

Message:

Move the "look for the first media attachment" code below the "look
in the post content for media" code, so that it is the method of last
resort. This way, if you attach AND embed media, you won't get duplication.

fixes #23879

File:

• trunk/wp-includes/media.php (modified) (2 diffs)

trunk/wp-includes/media.php

@@ -2070 +2070 @@
     }
 
-    $medias = call_user_func( 'get_attached_' . $type );
-    if ( ! empty( $medias ) ) {
-        $media = reset( $medias );
-        $url = wp_get_attachment_url( $media->ID );
-        $shortcode = sprintf( '[%s src="%s"]', $type, $url );
-        $post->format_content = do_shortcode( $shortcode );
-        return $post->format_content;
-    }
-
     // these functions expected a reference, not a value
     $_content = $post->post_content;
@@ -2107 +2098 @@
     }
 
+    $medias = call_user_func( 'get_attached_' . $type );
+    if ( ! empty( $medias ) ) {
+        $media = reset( $medias );
+        $url = wp_get_attachment_url( $media->ID );
+        $shortcode = sprintf( '[%s src="%s"]', $type, $url );
+        $post->format_content = do_shortcode( $shortcode );
+        return $post->format_content;
+    }
+
     return '';
 }