Changeset 36240 for trunk/src/wp-includes/media.php

Timestamp:

01/09/2016 02:17:02 PM (11 years ago)

Author:

swissspidy

Message:

Media: Fix wp_audio_shortcode and wp_video_shortcode attributes handling.

Although documented, the class and style attributes were simply ignored.
Adds unit tests.

Fixes #35367.

File:

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

trunk/src/wp-includes/media.php

@@ -2164 +2164 @@
  *     @type string $loop     The 'loop' attribute for the `<audio>` element. Default empty.
  *     @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
- *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default empty.
+ *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default 'none'.
  *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
- *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%'.
+ *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%; visibility: hidden;'.
  * }
  * @param string $content Shortcode content.
@@ -2201 +2201 @@
                 'loop'     => '',
                 'autoplay' => '',
-                'preload'  => 'none'
+                'preload'  => 'none',
+                'class'    => 'wp-audio-shortcode',
+                'style'    => 'width: 100%; visibility: hidden;'
         );
         foreach ( $default_types as $type ) {
@@ -2263 +2265 @@
          * @param string $class CSS class or list of space-separated classes.
          */
+         $atts['class'] = apply_filters( 'wp_audio_shortcode_class', $atts['class'] );
+
         $html_atts = array(
-                'class'    => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
+                'class'    => $atts['class'],
                 'id'       => sprintf( 'audio-%d-%d', $post_id, $instance ),
                 'loop'     => wp_validate_boolean( $atts['loop'] ),
                 'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
                 'preload'  => $atts['preload'],
-                'style'    => 'width: 100%; visibility: hidden;',
+                'style'    => $atts['style'],
         );
 
@@ -2408 +2412 @@
                 'width'    => 640,
                 'height'   => 360,
+                'class'    => 'wp-video-shortcode',
         );
 
@@ -2497 +2502 @@
          * @param string $class CSS class or list of space-separated classes.
          */
+         $atts['class'] = apply_filters( 'wp_video_shortcode_class', $atts['class'] );
+
         $html_atts = array(
-                'class'    => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
+                'class'    => $atts['class'],
                 'id'       => sprintf( 'video-%d-%d', $post_id, $instance ),
                 'width'    => absint( $atts['width'] ),