<!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>[12045] sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2: WordPress.TV: Preference the wptv uploaded original to the VideoPress original file.</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/12045">12045</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/12045","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>2022-09-02 05:43:23 +0000 (Fri, 02 Sep 2022)</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: Preference the wptv uploaded original to the VideoPress original file.
Follow up to <a href="http://meta.trac.wordpress.org/changeset/12043">[12043]</a>, <a href="http://meta.trac.wordpress.org/changeset/12044">[12044]</a>.</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>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2pluginswordpresstvrestwordpresstvrestphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-rest/wordpresstv-rest.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2sidebarsinglephp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.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 2022-09-02 05:27:26 UTC (rev 12044)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php 2022-09-02 05:43:23 UTC (rev 12045)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,6 +609,35 @@
</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">+ * Retrieve the original uploaded file details.
+ */
+ function get_video_attachment( $post = null ) {
+ $post = get_post( $post );
+ $videos = get_children(
+ array(
+ 'post_parent' => $post->ID,
+ 'post_mime_type' => 'video/%'
+ )
+ );
+
+ if ( ! $videos ) {
+ return false;
+ }
+
+ $videos = array_values( $videos );
+ return $videos[0];
+ }
+
+ /**
+ * Return the URL to the attached video.
+ */
+ function get_video_attachment_url( $post = null ) {
+ $attachment = $this->get_video_attachment( $post );
+
+ return $attachment ? wp_get_attachment_url( $attachment->ID ) : false;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the guid for the wpvideo video for a given post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_the_video_guid( $post = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,20 +827,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Add the Original uploaded file to the mediaRss output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function mrss_media_add_original( $meds ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_url = $this->get_video_attachment_url();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'find_all_videopress_shortcodes' ) ) {
- return $meds;
- }
-
- $videos = array_keys( find_all_videopress_shortcodes( $post->post_content ) );
- if ( ! $videos ) {
- return $meds;
- }
-
- $video = video_get_info_by_guid( $videos[0] );
- $original_url = video_attachment_url( $video );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $original_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meds[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2pluginswordpresstvrestwordpresstvrestphp"></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/plugins/wordpresstv-rest/wordpresstv-rest.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/plugins/wordpresstv-rest/wordpresstv-rest.php 2022-09-02 05:27:26 UTC (rev 12044)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-rest/wordpresstv-rest.php 2022-09-02 05:43:23 UTC (rev 12045)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,6 +142,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $video['producer']['link'] = 'https://profiles.wordpress.org/' . urlencode( $producer_username[0]->name ) . '/';
</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">+ $attachment_url = $wptv->get_video_attachment_url( $post );
+ if ( $attachment_url ) {
+ $video['video']['original'] = $attachment_url;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'find_all_videopress_shortcodes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_videos = array_keys( find_all_videopress_shortcodes( $post->post_content ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_videos ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +154,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $api_data = video_get_single_response( $post_video );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Original uploaded file, may vary in format.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $video['video']['original'] = $api_data['original'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $video['video']['original'] ) ) {
+ $video['video']['original'] = $api_data['original'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ogg - No longer generated as of May 2021
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $link = video_highest_resolution_ogg( $post_video ) ) {
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2sidebarsinglephp"></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/sidebar-single.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/sidebar-single.php 2022-09-02 05:27:26 UTC (rev 12044)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php 2022-09-02 05:43:23 UTC (rev 12045)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,10 @@
</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">- if ( ! empty( $api_data['original'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_url = $wptv->get_video_attachment_url();
+ if ( $attachment_url ) {
+ $mp4_links[] = "<a href='{$attachment_url}'>Original</a>";
+ } elseif ( ! empty( $api_data['original'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mp4_links[] = "<a href='{$api_data['original']}'>Original</a>";
</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>