<!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>[9175] sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2: WordPress.TV: Switch to using `$wptv->the_video_image()` for thumbnails, deprecating the thumbnail code in `$wptv->the_video()` which was no longer working.</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 { white-space: pre-line; 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/9175">9175</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/9175","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-10-14 01:24:16 +0000 (Mon, 14 Oct 2019)</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: Switch to using `$wptv->the_video_image()` for thumbnails, deprecating the thumbnail code in `$wptv->the_video()` which was no longer working.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4761">#4761</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2categorywordcamptvphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/category-wordcamptv.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2categoryphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/category.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2frontpagephp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/front-page.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2functionsphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2taxonomyeventphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/taxonomy-event.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2categorywordcamptvphp"></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/category-wordcamptv.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/category-wordcamptv.php 2019-10-11 02:57:44 UTC (rev 9174)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/category-wordcamptv.php 2019-10-14 01:24:16 UTC (rev 9175)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="group">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" rel="bookmark">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-thumbnail">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="<?php $wptv->the_video( true, true ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $wptv->the_video_image( 50, null, false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-title"><?php the_title(); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2categoryphp"></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/category.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/category.php 2019-10-11 02:57:44 UTC (rev 9174)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/category.php 2019-10-14 01:24:16 UTC (rev 9175)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="group">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php echo esc_attr( sprintf(__('Permanent Link to %s', ''), get_the_title() ) ); ?>" >
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-thumbnail">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="<?php $wptv->the_video( true, true ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $wptv->the_video_image( 50, null, false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-title"><?php the_title(); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,4 +95,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_sidebar(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .container -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php get_footer(); ?>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2frontpagephp"></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/front-page.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/front-page.php 2019-10-11 02:57:44 UTC (rev 9174)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/front-page.php 2019-10-14 01:24:16 UTC (rev 9175)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="group">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" rel="bookmark">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-thumbnail">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="<?php $wptv->the_video( true, true ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $wptv->the_video_image( 50, null, false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-title"><?php the_title(); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span></span></pre></div>
<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 2019-10-11 02:57:44 UTC (rev 9174)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php 2019-10-14 01:24:16 UTC (rev 9175)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,12 +573,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $originalcontent
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @param bool $thumb
- * @param bool $no_html
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function the_video( $thumb = false, $no_html = false ) {
- $image = $video = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function the_video() {
+ $video = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post, $originalcontent;
</span><span class="cx" style="display: block; padding: 0 10px"> $originalcontent = $post->post_content;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,7 +586,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $shortcodes as $shortcode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'wpvideo' == $shortcode[2] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = shortcode_parse_atts( $shortcode[0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image = video_image_url_by_guid( rtrim( $attributes[1], ']' ), 'fmt_dvd' ); // dvd image has width = 640
</del><span class="cx" style="display: block; padding: 0 10px"> $hd_param = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only set HD param is it won't already be set from `$shortcode[3]`.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,15 +598,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Output results
- if ( $thumb ) {
- if ( ! $no_html ) {
- $image = '<img width="650" src="' . esc_url( $image ) . '" alt="' . esc_attr( $post->post_title ) . '" />';
- }
- echo $image;
- } else {
- echo $video;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $video;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2taxonomyeventphp"></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/taxonomy-event.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/taxonomy-event.php 2019-10-11 02:57:44 UTC (rev 9174)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/taxonomy-event.php 2019-10-14 01:24:16 UTC (rev 9175)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="group">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php the_permalink(); ?>" rel="bookmark">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-thumbnail">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="<?php $wptv->the_video( true, true ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $wptv->the_video_image( 50, null, false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="video-title"><?php the_title(); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span></span></pre>
</div>
</div>
</body>
</html>