<!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>[8371] sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2: WordPress.TV: Adjust the title formats.</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/8371">8371</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/8371","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-02-28 07:10:01 +0000 (Thu, 28 Feb 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: Adjust the title formats.
This upgrades the theme to using the newer title support which handles the requested structure better.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4209">#4209</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_htmlwpcontentthemeswptv2headerphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/header.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 2019-02-28 06:36:31 UTC (rev 8370)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php 2019-02-28 07:10:01 UTC (rev 8371)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,12 +18,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'after_setup_theme', array( $this, 'setup' ) );
</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">- // Add any actions/filters that should run for WordPress.TV & Blog.WordPress.TV here.
- add_action( 'wp_head', array( $this, 'rel_canonical' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'after_setup_theme', array( $this, 'setup_always' ) );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Runs during after_setup_theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Runs during after_setup_theme on WordPress.TV
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function setup() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'widgets_init', array( $this, 'widgets_init' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +37,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_option_blog_upload_space', array( $this, 'blog_upload_space' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'document_title_parts', array( $this, 'document_title_parts' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> register_nav_menus( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'primary' => __( 'Primary Menu', 'wptv' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'footer' => __( 'Footer Menu', 'wptv' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +47,16 @@
</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">+ * Runs during after_setup_theme on WordPress.TV & blog.WordPress.TV
+ */
+ function setup_always() {
+ add_theme_support( 'title-tag' );
+
+ // Add any actions/filters that should run for WordPress.TV & Blog.WordPress.TV here.
+ add_action( 'wp_head', array( $this, 'rel_canonical' ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Output `<link rel="canonical">` links where needed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function rel_canonical() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +84,29 @@
</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">+ * Filter archive titles where needed.
+ */
+ function document_title_parts( $title ) {
+ $sep = apply_filters( 'document_title_separator', '-' );
+
+ if ( is_tax( 'language' ) ) {
+ $title['title'] = sprintf(
+ /* translators: %s: The language name. */
+ __( 'Videos in %s', 'wptv' ),
+ get_queried_object()->name
+ );
+ } elseif ( is_tax() || is_tag() || is_category() ) {
+ // Suffix the Taxonomy label to the Term Name
+ $tax = get_taxonomy( get_queried_object()->taxonomy );
+ $tax_label = $tax->labels->singular_name ?? $tax->label;
+
+ $title['title'] .= " $sep $tax_label";
+ }
+
+ return $title;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Different posts_per_page settings for different views. Runs during pre_get_posts.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Query $query The WP_Query instance.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,43 +857,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'wptv_enqueue_scripts' );
</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">- * Create a nicely formatted and more specific title element text for output
- * in head of document, based on current view.
- *
- * @global $paged
- * @global $page
- *
- *
- * @param string $title Default title text for current view.
- * @param string $sep Optional separator.
- * @return string The filtered title.
- */
-function wptv_wp_title( $title, $sep ) {
- if ( is_feed() ) {
- return $title;
- }
-
- global $paged, $page;
-
- // Add the site name.
- $title .= get_bloginfo( 'name', 'display' );
-
- // Add the site description for the home/front page.
- $site_description = get_bloginfo( 'description', 'display' );
- if ( $site_description && ( is_home() || is_front_page() ) ) {
- $title = "$title $sep $site_description";
- }
-
- // Add a page number if necessary.
- if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
- $title = "$title $sep " . sprintf( __( 'Page %s', 'wptv' ), max( $paged, $page ) );
- }
-
- return $title;
-}
-add_filter( 'wp_title', 'wptv_wp_title', 10, 2 );
-
-/**
</del><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></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 2019-02-28 06:36:31 UTC (rev 8370)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/header.php 2019-02-28 07:10:01 UTC (rev 8371)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta charset="<?php bloginfo( 'charset' ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <title><?php wp_title( '|', true, 'right' ); ?></title>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="alternate" type="application/rss+xml" title="<?php esc_attr_e( 'WordPress.tv RSS Feed', 'wptv' ); ?>" href="https://wordpress.tv/feed/" />
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="alternate" type="application/rss+xml" title="<?php esc_attr_e( 'WordPress.tv Blog RSS Feed', 'wptv' ); ?>" href="https://blog.wordpress.tv/feed/" />
</span></span></pre>
</div>
</div>
</body>
</html>