From 228fc639b9b475e3e68a450c1a64b228c44f19f8 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 5 Feb 2014 01:43:12 +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.


Built from https://develop.svn.wordpress.org/trunk@27097


git-svn-id: http://core.svn.wordpress.org/trunk@26968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 4 ++--
 wp-includes/media.php      | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index fb2141da46..8b5f3f84e6 100644
--- a/wp-includes/formatting.php
+++ b/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/wp-includes/media.php b/wp-includes/media.php
index b5f130d010..12cc86b964 100644
--- a/wp-includes/media.php
+++ b/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>';