<!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>[6374] sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2: WP.tv: Add docs for globals.</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/6374">6374</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/6374","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-12 19:08:37 +0000 (Fri, 12 Jan 2018)</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'>WP.tv: Add docs for globals.
Also updates some existing docs.
Props rushabh4486 for initial patch.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3134">#3134</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2404php">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/404.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2archivephp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/archive.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2breadcrumbsphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/breadcrumbs.php</a></li>
<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_htmlwpcontentthemeswptv2commentsphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/comments.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_htmlwpcontentthemeswptv2headerphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/header.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2indexphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/index.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2paginationphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/pagination.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2searchphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/search.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2sidebarsinglephp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2singlephp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/single.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_htmlwpcontentthemeswptv2404php"></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/404.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/404.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/404.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * WordCamp.tv Index Fallback
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * It will be weird if somebody sees this (but okay if 404)
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Query $wp_query
+ * @global WP_Post $post
+ * @global WordPressTV_Theme $wptv
</ins><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"> get_header();
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2archivephp"></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/archive.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/archive.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/archive.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * WordCamp.tv Archives
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Yearly, monthly, daily, author and whatever falls back to archive.php.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Query $wp_query
+ * @global WP_Post $post
+ * @global WordPressTV_Theme $wptv
</ins><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"> get_header();
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2breadcrumbsphp"></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/breadcrumbs.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/breadcrumbs.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/breadcrumbs.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Breadcrumbs template part, use with get_template_part()
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WordPressTV_Theme $wptv
</ins><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"> global $wptv;
</span></span></pre></div>
<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 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/category-wordcamptv.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * WordCampTV Category Archives
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Requires a special display, hence the template.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WordPressTV_Theme $wptv
</ins><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"> $featured = new WP_Query( array(
</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 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/category.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Category Archives
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Used for categories display, especially the to-do category.
</span><span class="cx" style="display: block; padding: 0 10px"> * Fallback to others as well.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Query $wp_query
+ * @global WordPressTV_Theme $wptv
</ins><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"> global $wp_query, $wptv;
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2commentsphp"></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/comments.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/comments.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/comments.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress.tv Comments Template
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses global $wptv->list_comments
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WordPressTV_Theme $wptv
</ins><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></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 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/front-page.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress.tv Front Page Template
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WordPressTV_Theme $wptv
</ins><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"> $featured_params = array(
</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 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,8 @@
</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"> * Different posts_per_page settings for different views. Runs during pre_get_posts.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param WP_Query $query The WP_Query instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function posts_per_page( $query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_per_page = $query->get( 'posts_per_page' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,6 +171,8 @@
</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"> * Render the Video Info box
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Post $post
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_video_info_metabox() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Save the values of meta box fields
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $post_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $post_id
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function save_meta_box_fields( $post_id, $post ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,9 +259,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Relies on various other filters used once.
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo optimize the get_tax_query part.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $search
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $search
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Query $query
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function search_posts_search( $search, &$query ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,9 +313,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This adds the JOIN clause resulting from the taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> * search. Make sure this filter runs only once per WP_Query request.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $join
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $join
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Query $query
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function search_posts_join( $join, &$query ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,9 +337,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * search query matches content and one or more taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> * This filter glues all duplicates. Use only once per WP_Query.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $group_by
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $group_by
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Query $query
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function search_posts_groupby( $group_by, &$query ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +355,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns a $tax_query array for an improved search.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $search
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_tax_query( $search ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,8 +395,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * fired via the wptv_list_comments callback wrapper.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $comment
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $args
- * @param int $depth
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $args
+ * @param int $depth
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function list_comments( $comment, $args, $depth ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['comment'] = $comment;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get VodPod Thumbnails, used by the_video_image
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $code
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_vodpod_thumbnails( $code ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,8 +539,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Outputs the video image
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $h
- * @param int $w
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $h
+ * @param int $w
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param bool $arrow
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $html_code
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +595,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Removes shortcodes from $originalcontent global
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_shortcodes( $content ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +607,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns the home URL
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return mixed|void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function home_url( $path = '' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +658,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $before
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $sep
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $after
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $display_count
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $display_count
+ * @return bool|void False if there are no terms.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function the_terms( $taxonomy = 'post_tag', $before = '', $sep = '', $after = '', $display_count = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_the_terms( get_post()->ID, $taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,9 +716,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $output
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $item
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $depth
- * @param array $args
- * @param int $id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $depth
+ * @param array $args
+ * @param int $id
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,8 +784,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * in head of document, based on current view.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title Default title text for current view.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $sep Optional separator.
- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $sep Optional separator.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The filtered title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wptv_wp_title( $title, $sep ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,7 +816,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Append the slide URL to the excerpt
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $excerpt
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wptv_excerpt_slides( $excerpt ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,7 +836,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * will be 'retro', and if it doesn't it'll be 'mm'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $username
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_username_exists( $username ) {
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2headerphp"></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/header.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/header.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/header.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress.tv Header Template
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global $wptv
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WordPressTV_Theme $wptv
</ins><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"> global $wptv;
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2indexphp"></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/index.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/index.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/index.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * WordCamp.tv Index Fallback
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * It will be weird if somebody sees this (but okay if 404)
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Query $wp_query
+ * @global WP_Post $post
+ * @global WordPressTV_Theme $wptv
</ins><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"> get_header();
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2paginationphp"></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/pagination.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/pagination.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/pagination.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Pagination template part, use with get_template_part()
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Query $wp_query
</ins><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"> if ( $wp_query->max_num_pages > 1 ) :
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2searchphp"></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/search.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/search.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/search.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global WP_Query $wp_query
+ */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // See improved improved (yes, improved twice) search.
</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 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,13 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php global $wptv, $originalcontent; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ *
+ * @global WordPressTV_Theme $wptv
+ * @global string $originalcontent
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+global $wptv, $originalcontent;
+?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="secondary-content video-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <h5>Published</h5>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="video-date"><?php echo get_the_date(); ?></p>
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2singlephp"></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/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/single.php 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/single.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Single Video Template
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WordPressTV_Theme $wptv
+ * @global string $originalcontent
</ins><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"> global $wptv, $originalcontent;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-get_header(); the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+get_header();
+the_post();
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wptv-hero group">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="container">
</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 2018-01-12 18:21:59 UTC (rev 6373)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/taxonomy-event.php 2018-01-12 19:08:37 UTC (rev 6374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Event Taxonomy Archives
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Displays for event listings like individual WordCamps.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Query $wp_query
+ * @global WordPressTV_Theme $wptv
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @todo cleanup and merge with category.php
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_query, $wptv;
</span></span></pre>
</div>
</div>
</body>
</html>