From 71947f18d33830d8ad4a2377d467b4b88cd22ee6 Mon Sep 17 00:00:00 2001
From: wonderboymusic <wonderboymusic@602fd350-edb4-49c9-b593-d223f7449a82>
Date: Wed, 5 Feb 2014 01:42:02 +0000
Subject: [PATCH] When a video shortcode has content in its body, append it as
 inner HTML in the resulting `<video>`.

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



git-svn-id: https://develop.svn.wordpress.org/trunk@27097 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/formatting.php |  4 ++--
 src/wp-includes/media.php      |  8 ++++++++
 tests/phpunit/tests/media.php  | 11 +++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index fb2141da46..8b5f3f84e6 100644
--- a/src/wp-includes/formatting.php
+++ b/src/wp-includes/formatting.php
@@ -3584,8 +3584,8 @@ function normalize_whitespace( $str ) {
 
 /**
  * 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 ''
  *
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index b5f130d010..12cc86b964 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -1233,6 +1233,14 @@ function wp_video_shortcode( $attr, $content = '' ) {
 			$html .= sprintf( $source, $type['type'], esc_url( $$fallback ) );
 		}
 	}
+
+	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 );
 	$html .= '</video>';
diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php
index fcfe7c3b33..9b1543f6c2 100644
--- a/tests/phpunit/tests/media.php
+++ b/tests/phpunit/tests/media.php
@@ -368,7 +368,6 @@ CONTENT;
 	/**
 	 * Test [video] shortcode processing
 	 *
-	 * @ticket 26864
 	 */
 	function test_video_shortcode_body() {
 		$width = 720;
@@ -393,13 +392,13 @@ VIDEO;
 		$content = apply_filters( 'the_content', $video );
 
 		$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";