<!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>[1712] sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php: WordPress.tv: Allow all [wpvideo] parameters to be used.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/1712">1712</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1712","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-07 18:05:16 +0000 (Tue, 07 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordPress.tv: Allow all [wpvideo] parameters to be used.
Previously the shortcode was overwritten, wiping out any parameters that had been added.
This was neccessary because one of the featured videos from WordCamp? Europe 2015 will not load in the old VideoPress? player with HD mode enabled, but adding hd=0 to the shortcode works around that problem until the new VideoPress? player can be integrated.
See ?\226?\128?\139http://wordpress.tv/2015/07/04/matt-mullenweg-keynote-qanda-wordcamp-europe-2015/
See ?\226?\128?\139https://wordpress.slack.com/archives/meta/p1436245724000263
See ?\226?\128?\139https://a8c.slack.com/archives/videopress/p1436283547005484</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2functionsphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php 2015-07-07 14:49:18 UTC (rev 1711)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php 2015-07-07 18:05:16 UTC (rev 1712)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,32 +468,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'the_content', array( $this, 'remove_shortcodes' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match_all( '/\[wpvideo +([a-zA-Z0-9,\#,\&,\/,;,",=, ]*?)\]/i', $post->post_content, $matches );
- foreach ( $matches[1] as $key => $code ) {
-
- preg_match( '/([0-9A-Za-z]+)/i', $code, $m );
- $guid = $m[1];
-
- $image = video_image_url_by_guid( $guid, 'fmt_dvd' ); //dvd image has width = 640
- $video = apply_filters( 'the_content', '[wpvideo ' . $guid . ' w=605]' );
-
- /*
- // Comment out the $video= line above and uncomment the following code to enable Unisubs
- $permalink = get_permalink( $post->ID );
- $video = <<<HTML
- <script type="text/javascript" src="http://unisubs.example.com:8000/site_media/embed.js">
- ({
- "video_url": "$permalink",
- "video_config": {
- "width": 648,
- "height": 425
- }
- })
- </script>
- HTML;
- $video .= apply_filters( 'the_content', '' );*/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // VideoPress
+ preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $shortcodes, PREG_SET_ORDER );
+ foreach ( $shortcodes as $shortcode ) {
+ if ( 'wpvideo' == $shortcode[2] ) {
+ $attributes = shortcode_parse_atts( $shortcode[0] );
+ $image = video_image_url_by_guid( rtrim( $attributes[1], ']' ), 'fmt_dvd' ); // dvd image has width = 640
+ $video = sprintf( '[%s %s w="605"]', $shortcode[2], trim( $shortcode[3] ) );
+ $video = apply_filters( 'the_content', $video );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // SlideShare
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '|\[slideshare (.+?)]|ie', $post->post_content, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $matches[1] as $key => $code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $code = '[slideshare ' . $code . ']';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,6 +496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // VodPod
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '|\[vodpod (.+?)]|ie', $post->post_content, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $matches[1] as $key => $code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $code = '[vodpod ' . $code . ']';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,6 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $video = $vodpod;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Output results
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $thumb ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $no_html ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = '<img width="650" src="' . esc_url( $image ) . '" alt="' . esc_attr( $post->post_title ) . '" />';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,6 +516,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $video;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( $this, 'remove_shortcodes' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>