Ticket #24456: 24456.diff

wp-includes/media.php

@@ -841 +841 @@
  * @param array $attr Attributes of the shortcode.
  * @return string HTML content to display audio.
  */
-function wp_audio_shortcode( $attr ) {
+function wp_audio_shortcode( $attr, $content = null ) {
         $post_id = get_post() ? get_the_ID() : 0;
 
         static $instances = 0;
@@ -854 +854 @@
         foreach ( $default_types as $type  )
                 $defaults_atts[$type] = '';
 
+        if ( empty( $attr['src'] ) && ! empty( $content ) )
+                $attr['src'] = $content;
+
         $atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
         extract( $atts );
 
@@ -940 +943 @@
  * @param array $attr Attributes of the shortcode.
  * @return string HTML content to display video.
  */
-function wp_video_shortcode( $attr ) {
+function wp_video_shortcode( $attr, $content = null ) {
         global $content_width;
         $post_id = get_post() ? get_the_ID() : 0;
 
@@ -960 +963 @@
         foreach ( $default_types as $type  )
                 $defaults_atts[$type] = '';
 
+        if ( empty( $attr['src'] ) && ! empty( $content ) )
+                $attr['src'] = $content;
+
         $atts = shortcode_atts( $defaults_atts, $attr, 'video' );
         extract( $atts );
 

wp-includes/class-wp-embed.php

@@ -137 +137 @@
         function shortcode( $attr, $url = '' ) {
                 $post = get_post();
 
+                if ( ! empty( $attr['src'] ) )
+                        $url = $attr['src'];
+
                 if ( empty( $url ) )
                         return '';