Ticket #24458: 24458.3.diff

wp-includes/js/media-editor.js

@@ -100 +100 @@
                         var shortcode, html;
 
                         props = wp.media.string.props( props, attachment );
+
                         shortcode = {};
 
-                        if ( props.mime ) {
-                                switch ( props.mime ) {
-                                case 'audio/mpeg':
-                                        if ( attachment.url.indexOf( 'mp3' ) )
-                                                shortcode.mp3 = attachment.url;
-                                        else if ( attachment.url.indexOf( 'm4a' ) )
-                                                shortcode.m4a = attachment.url;
-                                        break;
-                                case 'audio/mp3':
-                                        shortcode.mp3 = attachment.url;
-                                        break;
-                                case 'audio/m4a':
-                                        shortcode.m4a = attachment.url;
-                                        break;
-                                case 'audio/wav':
-                                        shortcode.wav = attachment.url;
-                                        break;
-                                case 'audio/ogg':
-                                        shortcode.ogg = attachment.url;
-                                        break;
-                                case 'audio/x-ms-wma':
-                                case 'audio/wma':
-                                        shortcode.wma = attachment.url;
-                                        break;
-                                }
-                        }
+                        shortcode.id = attachment.id;
 
                         html = wp.shortcode.string({
                                 tag:     'audio',
@@ -144 +120 @@
 
                         shortcode = {};
 
+                        shortcode.id = attachment.id;
+
                         if ( attachment.width )
                                 shortcode.width = attachment.width;
 
                         if ( attachment.height )
                                 shortcode.height = attachment.height;
 
-                        if ( props.mime ) {
-                                switch ( props.mime ) {
-                                case 'video/mp4':
-                                        shortcode.mp4 = attachment.url;
-                                        break;
-                                case 'video/m4v':
-                                        shortcode.m4v = attachment.url;
-                                        break;
-                                case 'video/webm':
-                                        shortcode.webm = attachment.url;
-                                        break;
-                                case 'video/ogg':
-                                        shortcode.ogv = attachment.url;
-                                        break;
-                                case 'video/x-ms-wmv':
-                                case 'video/wmv':
-                                case 'video/asf':
-                                        shortcode.wmv = attachment.url;
-                                        break;
-                                case 'video/flv':
-                                case 'video/x-flv':
-                                        shortcode.flv = attachment.url;
-                                        break;
-                                }
-                        }
-
                         html = wp.shortcode.string({
                                 tag:     'video',
                                 attrs:   shortcode

wp-includes/media.php

@@ -850 +850 @@
         $audio = null;
 
         $default_types = wp_get_audio_extensions();
-        $defaults_atts = array( 'src' => '' );
+        $defaults_atts = array(
+                'src' => '',
+                'id' => ''
+        );
         foreach ( $default_types as $type  )
                 $defaults_atts[$type] = '';
 
         $atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
         extract( $atts );
 
+        if ( $id ) // if 'id' is set, use that, and ignore 'src'
+                $src = wp_get_attachment_url( $id );
+
         $primary = false;
         if ( ! empty( $src ) ) {
                 $type = wp_check_filetype( $src );
@@ -952 +958 @@
         $default_types = wp_get_video_extensions();
         $defaults_atts = array(
                 'src' => '',
+                'id' => '',
                 'poster' => '',
                 'height' => 360,
                 'width' => empty( $content_width ) ? 640 : $content_width,
@@ -963 +970 @@
         $atts = shortcode_atts( $defaults_atts, $attr, 'video' );
         extract( $atts );
 
+        if ( $id ) // if 'id' is set, use that, and ignore 'src'
+                $src = wp_get_attachment_url( $id );
+
         $w = $width;
         $h = $height;
         if ( is_admin() && $width > 600 )