Ticket #40590: 40590-4.diff

src/wp-includes/media.php

@@ -2495 +2495 @@
  * WordPress mp4s in a post.
  *
  * @since 3.6.0
+ * @since ?.?.? The `controls` attribute was added.
  *
  * @global int $content_width
  * @staticvar int $instance
@@ -2512 +2513 @@
  *                            Default 'metadata'.
  *     @type string $class    The 'class' attribute for the `<video>` element.
  *                            Default 'wp-video-shortcode'.
+ *     @type string $controls The 'controls' attribute for the `<video>` element. Default true.
  * }
  * @param string $content Shortcode content.
  * @return string|void HTML content to display video.
@@ -2555 +2557 @@
                 'width'    => 640,
                 'height'   => 360,
                 'class'    => 'wp-video-shortcode',
+                'controls' => true,
         );
 
         foreach ( $default_types as $type ) {
@@ -2676 +2679 @@
                 'loop'     => wp_validate_boolean( $atts['loop'] ),
                 'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
                 'preload'  => $atts['preload'],
+                'controls' => wp_validate_boolean( $atts['controls'] ) ? 'controls' : '',
         );
 
         // These ones should just be omitted altogether if they are blank
-        foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {
+        foreach ( array( 'poster', 'loop', 'autoplay', 'preload', 'controls' ) as $a ) {
                 if ( empty( $html_atts[ $a ] ) ) {
                         unset( $html_atts[ $a ] );
                 }
@@ -2694 +2698 @@
         if ( 'mediaelement' === $library && 1 === $instance ) {
                 $html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n";
         }
-        $html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
+        $html .= sprintf( '<video %s>', join( ' ', $attr_strings ) );
 
         $fileurl = '';
         $source  = '<source type="%s" src="%s" />';

tests/phpunit/tests/media.php

@@ -874 +874 @@
         }
 
         /**
-         * @ticket  35367
+         * @ticket 35367
+         * @ticket 40590
          * @depends test_video_shortcode_body
          */
         function test_wp_video_shortcode_attributes() {
@@ -891 +892 @@
                 $this->assertContains( 'width="640"', $actual );
                 $this->assertContains( 'height="360"', $actual );
                 $this->assertContains( 'class="wp-video-shortcode"', $actual );
+                $this->assertContains( 'controls="controls"', $actual );
 
                 $actual = wp_video_shortcode(
                         array(
@@ -902 +904 @@
                                 'width'    => 123,
                                 'height'   => 456,
                                 'class'    => 'foobar',
+                                'controls' => false,
                         )
                 );
 
@@ -913 +916 @@
                 $this->assertContains( 'width="123"', $actual );
                 $this->assertContains( 'height="456"', $actual );
                 $this->assertContains( 'class="foobar"', $actual );
+                $this->assertNotContains( 'controls="controls"', $actual );
         }
 
         /**