Changeset 24547 for trunk/wp-admin/includes/media.php

Timestamp:

07/03/2013 08:19:00 PM (13 years ago)

Author:

nacin

Message:

Call shortcode functions directly. props kovshenin, fixes #24505.

File:

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

trunk/wp-admin/includes/media.php

@@ -2358 +2358 @@
     elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'audio/' ) ):
 
-        echo do_shortcode( '[audio src="' . $att_url . '"]' );
+        echo wp_audio_shortcode( array( 'src' => $att_url ) );
 
     elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'video/' ) ):
@@ -2370 +2370 @@
             $h = round( ( $meta['height'] * $w ) / $meta['width'] );
 
-        $shortcode = sprintf( '[video src="%s"%s%s]',
-            $att_url,
-            empty( $meta['width'] ) ? '' : sprintf( ' width="%d"', $w ),
-            empty( $meta['height'] ) ? '' : sprintf( ' height="%d"', $h )
-        );
-        echo do_shortcode( $shortcode );
+        $attr = array( 'src' => $att_url );
+
+        if ( ! empty( $meta['width' ] ) )
+            $attr['width'] = $w;
+
+        if ( ! empty( $meta['height'] ) )
+            $attr['height'] = $h;
+
+        echo wp_video_shortcode( $attr );
 
     endif; ?>