Ticket #25312: 25312.patch

src/wp-includes/media.php

@@ -865 +865 @@
         foreach ( $default_types as $type )
                 $defaults_atts[$type] = '';
 
-        $atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
-        extract( $atts );
+        $shortcode_atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
+        extract( $shortcode_atts );
 
         $primary = false;
         if ( ! empty( $src ) ) {
@@ -944 +944 @@
                 $html .= wp_mediaelement_fallback( $fileurl );
         $html .= '</audio>';
 
-        return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library );
+        return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library, $shortcode_atts );
 }
 add_shortcode( 'audio', apply_filters( 'wp_audio_shortcode_handler', 'wp_audio_shortcode' ) );
 
@@ -992 +992 @@
         foreach ( $default_types as $type )
                 $defaults_atts[$type] = '';
 
-        $atts = shortcode_atts( $defaults_atts, $attr, 'video' );
-        extract( $atts );
+        $shortcode_atts = shortcode_atts( $defaults_atts, $attr, 'video' );
+        extract( $shortcode_atts );
 
         $w = $width;
         $h = $height;
@@ -1088 +1088 @@
         $html .= '</video>';
 
         $html = sprintf( '<div style="width: %dpx; max-width: 100%%;">%s</div>', $width, $html );
-        return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library );
+        return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library, $shortcode_atts );
 }
 add_shortcode( 'video', apply_filters( 'wp_video_shortcode_handler', 'wp_video_shortcode' ) );