Changeset 27097

Timestamp:

02/05/2014 01:42:02 AM (13 years ago)

Author:

wonderboymusic

Message:

When a video shortcode has content in its body, append it as inner HTML in the resulting <video>.

Reverts [27096].
Fixes #26628.
See #27016.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -3585 +3585 @@
 /**
  * Properly strip all HTML tags including script and style
- * 
- * This differs from strip_tags() because it removes the contents of 
+ *
+ * This differs from strip_tags() because it removes the contents of
  * the <script> and <style> tags. E.g. strip_tags( '<script>something</script>' )
  * will return 'something'. wp_strip_all_tags will return ''

trunk/src/wp-includes/media.php

@@ -1234 +1234 @@
                 }
         }
+
+        if ( ! empty( $content ) ) {
+                if ( false !== strpos( $content, "\n" ) )
+                        $content = str_replace( array( "\r\n", "\n", "\t" ), '', $content );
+
+                $html .= trim( $content );
+        }
+
         if ( 'mediaelement' === $library )
                 $html .= wp_mediaelement_fallback( $fileurl );

trunk/tests/phpunit/tests/media.php

@@ -369 +369 @@
          * Test [video] shortcode processing
          *
-         * @ticket 26864
          */
         function test_video_shortcode_body() {
@@ -394 +393 @@
 
                 $expected = '<div style="width: ' . $w . 'px; max-width: 100%;" class="wp-video">' .
-                        "<!--[if lt IE 9]><script>document.createElement(\'video\');</script><![endif]-->\n" .
+                        "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n" .
                         '<video class="wp-video-shortcode" id="video-0-1" width="' . $w . '" height="' . $h . '" preload="metadata" controls="controls">' .
                         '<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />' .
-                        '<source type="video/webm" src="myvideo.webm" />' .
-                        '<source type="video/ogg" src="myvideo.ogv" />' .
-                        '<track kind="subtitles" src="subtitles.srt" srclang="en" />' .
-                        '<track kind="chapters" src="chapters.srt" srclang="en" />' .
+                        '<!-- WebM/VP8 for Firefox4, Opera, and Chrome --><source type="video/webm" src="myvideo.webm" />' .
+                        '<!-- Ogg/Vorbis for older Firefox and Opera versions --><source type="video/ogg" src="myvideo.ogv" />' .
+                        '<!-- Optional: Add subtitles for each language --><track kind="subtitles" src="subtitles.srt" srclang="en" />' .
+                        '<!-- Optional: Add chapters --><track kind="chapters" src="chapters.srt" srclang="en" />' .
                         '<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">' .
                         "http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a></video></div>\n";