<!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>[9733] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer: Developer theme: Centralize page HEAD-related customizations into recently added inc/head.php 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/9733">9733</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/9733","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-04-15 22:12:33 +0000 (Wed, 15 Apr 2020)</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'>Developer theme: Centralize page HEAD-related customizations into recently added inc/head.php file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincextrasphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincheadphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/head.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php 2020-04-15 21:39:42 UTC (rev 9732)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php 2020-04-15 22:12:33 UTC (rev 9733)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,21 +166,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'breadcrumb_trail_items', __NAMESPACE__ . '\\breadcrumb_trail_items_for_hooks', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'breadcrumb_trail_items', __NAMESPACE__ . '\\breadcrumb_trail_items_for_handbook_root', 10, 2 );
</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_filter( 'document_title_separator', __NAMESPACE__ . '\\theme_title_separator', 10, 2 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'syntaxhighlighter_htmlresult', __NAMESPACE__ . '\\syntaxhighlighter_htmlresult' );
</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">- * Customize the theme title separator.
- *
- * @return string
- */
-function theme_title_separator(){
- return '|';
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Fix breadcrumb for hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * A hook has a parent (the function containing it), which causes the Breadcrumb
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,26 +408,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $new_text;
</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">-/**
- * Outputs `<link rel="canonical">` tags where appropriate.
- */
-function rel_canonical() {
- $canonical = false;
- $queried_object = get_queried_object();
-
- if ( is_tax() || is_tag() || is_category() ) {
- $canonical = get_term_link( $queried_object );
- } elseif ( is_post_type_archive() ) {
- $canonical = get_post_type_archive_link( $queried_object->name );
- }
-
- if ( $canonical && get_query_var( 'paged' ) > 1 ) {
- $canonical .= 'page/' . (int) get_query_var( 'paged' ) . '/';
- }
-
- if ( $canonical ) {
- printf( '<link rel="canonical" href="%s">' . "\n", esc_url( $canonical ) );
- }
-}
-add_action( 'wp_head', __NAMESPACE__ . '\rel_canonical', 9 );
-
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincextrasphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php 2020-04-15 21:39:42 UTC (rev 9732)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php 2020-04-15 22:12:33 UTC (rev 9733)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,60 +36,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'body_class', 'wporg_developer_body_classes' );
</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">- * Filters document title to add context based on what is being viewed.
- *
- * @param array $parts The document title parts.
- * @return array The document title parts.
- */
-function wporg_developer_document_title( $parts ) {
- global $page, $paged;
-
- if ( is_feed() ) {
- return $parts;
- }
-
- $title = $parts['title'];
- $sep = '|';
-
- $post_type = get_query_var( 'post_type' );
-
- // Omit 'Home' from the home page.
- if ( 'Home' === $title ) {
- $title = '';
- }
- // Add post type to title if it's a parsed item.
- elseif ( is_singular() && \DevHub\is_parsed_post_type( $post_type ) ) {
- if ( $post_type_object = get_post_type_object( $post_type ) ) {
- $title .= " $sep " . get_post_type_object( $post_type )->labels->singular_name;
- }
- }
- // Add handbook name to title if relevent
- elseif ( ( is_singular() || is_post_type_archive() ) && false !== strpos( $post_type, 'handbook' ) ) {
- if ( $post_type_object = get_post_type_object( $post_type ) ) {
- $handbook_label = get_post_type_object( $post_type )->labels->name;
- $handbook_name = \WPorg_Handbook::get_name( $post_type ) . " Handbook";
-
- // Replace title with handbook name if this is landing page for the handbook
- if ( $title == $handbook_label ) {
- $title = $handbook_name;
- // Otherwise, append the handbook name
- } else {
- $title .= " $sep " . $handbook_name;
- }
- }
- }
-
- // Add a page number if necessary:
- if ( isset( $parts['page'] ) && $parts['page'] >= 2 ) {
- $title .= " $sep " . sprintf( __( 'Page %s', 'wporg' ), $parts['page'] );
- }
-
- $parts['title'] = $title;
- return $parts;
-}
-add_filter( 'document_title_parts', 'wporg_developer_document_title' );
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Prefixes excerpts for archive view with content type label.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $excerpt The excerpt.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincheadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/head.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/head.php 2020-04-15 21:39:42 UTC (rev 9732)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/head.php 2020-04-15 22:12:33 UTC (rev 9733)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,77 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Handles adding/removing hooks as needed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function do_init() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wp_head', array( __CLASS__, 'output_head_tags' ), 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'document_title_parts', array( __CLASS__, 'document_title' ) );
+ add_filter( 'document_title_separator', array( __CLASS__, 'document_title_separator' ) );
+ add_action( 'wp_head', array( __CLASS__, 'rel_canonical' ), 9 );
+ add_action( 'wp_head', array( __CLASS__, 'output_head_tags' ), 2 );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters document title to add context based on what is being viewed.
+ *
+ * @param array $parts The document title parts.
+ * @return array The document title parts.
+ */
+ public static function document_title( $parts ) {
+ global $page, $paged;
+
+ if ( is_feed() ) {
+ return $parts;
+ }
+
+ $title = $parts['title'];
+ $sep = '|';
+
+ $post_type = get_query_var( 'post_type' );
+
+ // Omit 'Home' from the home page.
+ if ( 'Home' === $title ) {
+ $title = '';
+ }
+ // Add post type to title if it's a parsed item.
+ elseif ( is_singular() && \DevHub\is_parsed_post_type( $post_type ) ) {
+ if ( $post_type_object = get_post_type_object( $post_type ) ) {
+ $title .= " $sep " . get_post_type_object( $post_type )->labels->singular_name;
+ }
+ }
+ // Add handbook name to title if relevent
+ elseif ( ( is_singular() || is_post_type_archive() ) && false !== strpos( $post_type, 'handbook' ) ) {
+ if ( $post_type_object = get_post_type_object( $post_type ) ) {
+ $handbook_label = get_post_type_object( $post_type )->labels->name;
+ $handbook_name = \WPorg_Handbook::get_name( $post_type ) . " Handbook";
+
+ // Replace title with handbook name if this is landing page for the handbook
+ if ( $title == $handbook_label ) {
+ $title = $handbook_name;
+ // Otherwise, append the handbook name
+ } else {
+ $title .= " $sep " . $handbook_name;
+ }
+ }
+ }
+
+ // Add a page number if necessary:
+ if ( isset( $parts['page'] ) && $parts['page'] >= 2 ) {
+ $title .= " $sep " . sprintf( __( 'Page %s', 'wporg' ), $parts['page'] );
+ }
+
+ $parts['title'] = $title;
+
+ return $parts;
+ }
+
+ /**
+ * Customizes the document title separator.
+ *
+ * @param string $separator Current document title separator.
+ * @return string
+ */
+ public static function document_title_separator( $separator ) {
+ return '|';
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Outputs tags for the page head.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function output_head_tags() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +174,28 @@
</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">+ /**
+ * Outputs `<link rel="canonical">` tags where appropriate.
+ */
+ public static function rel_canonical() {
+ $canonical = false;
+ $queried_object = get_queried_object();
+
+ if ( is_tax() || is_tag() || is_category() ) {
+ $canonical = get_term_link( $queried_object );
+ } elseif ( is_post_type_archive() ) {
+ $canonical = get_post_type_archive_link( $queried_object->name );
+ }
+
+ if ( $canonical && get_query_var( 'paged' ) > 1 ) {
+ $canonical .= 'page/' . (int) get_query_var( 'paged' ) . '/';
+ }
+
+ if ( $canonical ) {
+ printf( '<link rel="canonical" href="%s">' . "\n", esc_url( $canonical ) );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } // DevHub_Head
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> DevHub_Head::init();
</span></span></pre>
</div>
</div>
</body>
</html>