<!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>[4294] sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/handbook.php: Handbook plugin: Change handling for noting is_handbook_root.</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/4294">4294</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/4294","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>2016-10-25 21:59:19 +0000 (Tue, 25 Oct 2016)</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'>Handbook plugin: Change handling for noting is_handbook_root.
See #core38401.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookhandbookphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/handbook.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookhandbookphp"></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/plugins/handbook/handbook.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/plugins/handbook/handbook.php 2016-10-25 21:48:01 UTC (rev 4293)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/handbook.php 2016-10-25 21:59:19 UTC (rev 4294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'post_type_link', array( $this, 'post_type_link' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', array( $this, 'redirect_handbook_root_page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'template_include', array( $this, 'template_include' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'query_vars', array( $this, 'add_query_vars' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'widgets_init', array( $this, 'handbook_sidebar' ), 11 ); // After P2
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_email_changes_for_post_types', array( $this, 'wporg_email_changes_for_post_types' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,11 +272,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * post type archive link for the handbook.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function redirect_handbook_root_page() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_query;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular( $this->post_type )
</span><span class="cx" style="display: block; padding: 0 10px"> &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! is_preview()
</span><span class="cx" style="display: block; padding: 0 10px"> &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! get_query_var( 'is_handbook_root' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! $wp_query->is_handbook_root
</ins><span class="cx" style="display: block; padding: 0 10px"> &&
</span><span class="cx" style="display: block; padding: 0 10px"> in_array( get_query_var( 'name' ), array( $this->post_type, substr( $this->post_type, 0, -9 ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,6 +297,8 @@
</span><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 template_include( $template ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_query;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $handbook_templates = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For singular handbook pages not of the 'handbook' post type.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $handbook_templates = array( "single-{$this->post_type}.php", 'single-handbook.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // For handbook landing page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( get_query_var( 'is_handbook_root' ) && get_query_var( 'handbook' ) === $this->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( $wp_query->is_handbook_root && get_query_var( 'handbook' ) === $this->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'handbook' !== $this->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $handbook_templates[] = "single-{$this->post_type}.php";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,19 +322,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $template;
</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 public query vars for handbooks.
- *
- * @param array $public_query_vars The array of whitelisted query variables.
- * @return array Array with public query vars.
- */
- function add_query_vars( $public_query_vars ) {
- $public_query_vars['is_handbook_root'] = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function pre_get_posts( $query ) {
+ $query->is_handbook_root = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $public_query_vars;
- }
-
- function pre_get_posts( $query ) {
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $query->is_main_query() && ! $query->is_admin && ! $query->is_search && $query->is_post_type_archive( $this->post_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the post type has a page to act as an archive index page, get that.
</span><span class="cx" style="display: block; padding: 0 10px"> $page = get_page_by_path( $this->post_type, OBJECT, $this->post_type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'p', $page->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query->set('is_handbook_root', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query->is_handbook_root = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query->is_archive = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $query->is_post_type_archive = false;
</span></span></pre>
</div>
</div>
</body>
</html>