<!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>[954] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc: Code Reference: override default handbook configuration (and other affected areas) to make the canonical post type slug plural</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/954">954</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/954","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>2014-10-29 20:07:38 +0000 (Wed, 29 Oct 2014)</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'>Code Reference: override default handbook configuration (and other affected areas) to make the canonical post type slug plural</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinchandbooksphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/handbooks.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincredirectsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/redirects.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinctemplatetagsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinchandbooksphp"></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/handbooks.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/handbooks.php 2014-10-29 19:30:54 UTC (rev 953)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/handbooks.php 2014-10-29 20:07:38 UTC (rev 954)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( __CLASS__, 'autolink_credits' ) );
</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( 'handbook_post_type_defaults', array( __CLASS__, 'filter_handbook_post_type_defaults' ), 10, 2 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the handbook's 'Watch' action link.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( 'WPorg_Handbook_Watchlist' ) && method_exists( 'WPorg_Handbook_Watchlist', 'display_action_link' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_action_links', array( 'WPorg_Handbook_Watchlist', 'display_action_link' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,6 +117,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">+ * Overrides default handbook post type configuration.
+ *
+ * Specifically, uses a plural slug while retaining pre-existing singular post
+ * type name.
+ *
+ * @access public
+ *
+ * @param array $defaults The default post type configuration.
+ * @param string $post_type The post type name.
+ * @return array
+ */
+ public static function filter_handbook_post_type_defaults( $defaults, $post_type ) {
+ $defaults['rewrite'] = array(
+ 'feeds' => false,
+ 'slug' => $post_type . 's',
+ 'with_front' => false,
+ );
+
+ return $defaults;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * For specific credit pages, link @usernames references to their profiles on
</span><span class="cx" style="display: block; padding: 0 10px"> * profiles.wordpress.org.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincredirectsphp"></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/redirects.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/redirects.php 2014-10-29 19:30:54 UTC (rev 953)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/redirects.php 2014-10-29 20:07:38 UTC (rev 954)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', array( __CLASS__, 'redirect_single_search_match' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', array( __CLASS__, 'redirect_handbook' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', array( __CLASS__, 'redirect_resources' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'template_redirect', array( __CLASS__, 'redirect_pluralized_handbooks' ), 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'template_redirect', array( __CLASS__, 'redirect_singularized_handbooks' ), 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', array( __CLASS__, 'redirect_pluralized_reference_post_types' ), 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,23 +66,23 @@
</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">- * Redirects requests for the pluralized slugs of the handbooks.
- *
- * Note: this is a convenience redirect of just the naked slugs and not a
- * fix for any deployed links.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Redirects requests for the singularized form of handbook slugs to the
+ * pluralized version.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function redirect_pluralized_handbooks() {
- $name = get_query_var( 'name' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function redirect_singularized_handbooks() {
+ $path = trailingslashit( $_SERVER['REQUEST_URI'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // '/plugins' => '/plugin'
- if ( 'plugins' == $name ) {
- wp_redirect( get_post_type_archive_link( 'plugin-handbook' ), 301 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // '/plugin' => '/plugins'
+ if ( 0 === strpos( $path, '/plugin/' ) ) {
+ $path = get_post_type_archive_link( 'plugin-handbook' ) . substr( $path, 8 );
+ wp_redirect( $path, 301 );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit();
</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">- // '/themes' => '/theme'
- if ( 'themes' == $name ) {
- wp_redirect( get_post_type_archive_link( 'theme-handbook' ), 301 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // '/theme' => '/themes'
+ if ( 0 === strpos( $path, '/theme/' ) ) {
+ $path = get_post_type_archive_link( 'theme-handbook' ) . substr( $path, 7 );
+ wp_redirect( $path, 301 );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit();
</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="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinctemplatetagsphp"></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/template-tags.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/template-tags.php 2014-10-29 19:30:54 UTC (rev 953)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php 2014-10-29 20:07:38 UTC (rev 954)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,9 +437,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'Developer Resources: %s', 'wporg' ), get_the_title() );
</span><span class="cx" style="display: block; padding: 0 10px"> case 'reference':
</span><span class="cx" style="display: block; padding: 0 10px"> return __( 'Code Reference', 'wporg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'plugin':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'plugins':
</ins><span class="cx" style="display: block; padding: 0 10px"> return __( 'Plugin Handbook', 'wporg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'theme':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'themes':
</ins><span class="cx" style="display: block; padding: 0 10px"> return __( 'Theme Handbook', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> return __( 'Developer Resources', 'wporg' );
</span></span></pre>
</div>
</div>
</body>
</html>