<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27097] trunk: When a video shortcode has content in its body, append it as inner HTML in the resulting `<video>`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27097">27097</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-02-05 01:42:02 +0000 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When a video shortcode has content in its body, append it as inner HTML in the resulting `<video>`.
Reverts <a href="http://core.trac.wordpress.org/changeset/27096">[27096]</a>.
Fixes <a href="http://core.trac.wordpress.org/ticket/26628">#26628</a>.
See <a href="http://core.trac.wordpress.org/ticket/27016">#27016</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (27096 => 27097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-02-05 01:24:58 UTC (rev 27096)
+++ trunk/src/wp-includes/formatting.php 2014-02-05 01:42:02 UTC (rev 27097)
</span><span class="lines">@@ -3584,8 +3584,8 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Properly strip all HTML tags including script and style
</span><del>- *
- * This differs from strip_tags() because it removes the contents of
</del><ins>+ *
+ * This differs from strip_tags() because it removes the contents of
</ins><span class="cx"> * the <script> and <style> tags. E.g. strip_tags( '<script>something</script>' )
</span><span class="cx"> * will return 'something'. wp_strip_all_tags will return ''
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27096 => 27097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-02-05 01:24:58 UTC (rev 27096)
+++ trunk/src/wp-includes/media.php 2014-02-05 01:42:02 UTC (rev 27097)
</span><span class="lines">@@ -1233,6 +1233,14 @@
</span><span class="cx"> $html .= sprintf( $source, $type['type'], esc_url( $$fallback ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if ( ! empty( $content ) ) {
+ if ( false !== strpos( $content, "\n" ) )
+ $content = str_replace( array( "\r\n", "\n", "\t" ), '', $content );
+
+ $html .= trim( $content );
+ }
+
</ins><span class="cx"> if ( 'mediaelement' === $library )
</span><span class="cx"> $html .= wp_mediaelement_fallback( $fileurl );
</span><span class="cx"> $html .= '</video>';
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/media.php (27096 => 27097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/media.php 2014-02-05 01:24:58 UTC (rev 27096)
+++ trunk/tests/phpunit/tests/media.php 2014-02-05 01:42:02 UTC (rev 27097)
</span><span class="lines">@@ -368,7 +368,6 @@
</span><span class="cx"> /**
</span><span class="cx"> * Test [video] shortcode processing
</span><span class="cx"> *
</span><del>- * @ticket 26864
</del><span class="cx"> */
</span><span class="cx"> function test_video_shortcode_body() {
</span><span class="cx"> $width = 720;
</span><span class="lines">@@ -393,13 +392,13 @@
</span><span class="cx"> $content = apply_filters( 'the_content', $video );
</span><span class="cx">
</span><span class="cx"> $expected = '<div style="width: ' . $w . 'px; max-width: 100%;" class="wp-video">' .
</span><del>- "<!--[if lt IE 9]><script>document.createElement(\'video\');</script><![endif]-->\n" .
</del><ins>+ "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n" .
</ins><span class="cx"> '<video class="wp-video-shortcode" id="video-0-1" width="' . $w . '" height="' . $h . '" preload="metadata" controls="controls">' .
</span><span class="cx"> '<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />' .
</span><del>- '<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" />' .
</del><ins>+ '<!-- 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" />' .
</ins><span class="cx"> '<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">' .
</span><span class="cx"> "http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a></video></div>\n";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>