<!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>[7319] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer: Developer: Use query_vars correctly.</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/7319">7319</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/7319","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-06-19 09:44:33 +0000 (Tue, 19 Jun 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'>Developer: Use query_vars correctly.
Props grapplerulrich, johnbillion, SergeyBiryukov.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2882">#2882</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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_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_htmlwpcontentthemespubwporgdeveloperincsearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopersearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopersearchformphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/searchform.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2018-06-19 07:50:49 UTC (rev 7318)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php 2018-06-19 09:44:33 UTC (rev 7319)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</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 wporg_filter_archive_excerpt( $excerpt ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_single() && ! get_query_var( 'is_handbook' ) && 'command' !== get_query_var( 'post_type' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_single() && ! $GLOBALS['wp_query']->is_handbook && 'command' !== get_query_var( 'post_type' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = get_the_ID();
</span><span class="cx" style="display: block; padding: 0 10px"> $type = get_post_type_object( get_post_type( $post_id ) )->labels->singular_name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,4 +200,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $page_links;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'loop_pagination', 'wporg_loop_pagination' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del></span></pre></div>
<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 2018-06-19 07:50:49 UTC (rev 7318)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/handbooks.php 2018-06-19 09:44:33 UTC (rev 7319)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,10 +62,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array with public query vars.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function add_query_vars( $public_query_vars ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $public_query_vars['is_handbook'] = false;
- $public_query_vars['current_handbook'] = false;
- $public_query_vars['current_handbook_home_url'] = false;
- $public_query_vars['current_handbook_name'] = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $public_query_vars[] = 'current_handbook';
+ $public_query_vars[] = 'current_handbook_home_url';
+ $public_query_vars[] = 'current_handbook_name';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $public_query_vars;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,16 +75,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param \WP_Query $query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function pre_get_posts( $query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_handbook = function_exists( 'wporg_is_handbook' ) ? wporg_is_handbook() : false;
- $query->set( 'is_handbook', $is_handbook );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query->is_handbook = function_exists( 'wporg_is_handbook' ) && wporg_is_handbook();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_handbook = function_exists( 'wporg_get_current_handbook' ) ? wporg_get_current_handbook() : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_handbook = function_exists( 'wporg_get_current_handbook' ) ? (string) wporg_get_current_handbook() : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'current_handbook', $current_handbook );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_handbook_home_url = function_exists( 'wporg_get_current_handbook_home_url' ) ? wporg_get_current_handbook_home_url() : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_handbook_home_url = function_exists( 'wporg_get_current_handbook_home_url' ) ? (string) wporg_get_current_handbook_home_url() : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'current_handbook_home_url', $current_handbook_home_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_handbook_name = function_exists( 'wporg_get_current_handbook_name' ) ? wporg_get_current_handbook_name() : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_handbook_name = function_exists( 'wporg_get_current_handbook_name' ) ? (string) wporg_get_current_handbook_name() : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'current_handbook_name', $current_handbook_name );
</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_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 2018-06-19 07:50:49 UTC (rev 7318)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/redirects.php 2018-06-19 09:44:33 UTC (rev 7319)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,9 +30,13 @@
</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"> * Redirects a search query with only one result directly to that result.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @globals \WP_Query $wp_query Global WP_Query instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function redirect_single_search_match() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_search() && ! get_query_var( 'is_handbook' ) && 1 == $GLOBALS['wp_query']->found_posts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_query;
+
+ if ( is_search() && ! $wp_query->is_handbook && 1 == $wp_query->found_posts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( get_permalink( get_post() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincsearchphp"></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/search.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/search.php 2018-06-19 07:50:49 UTC (rev 7318)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php 2018-06-19 09:44:33 UTC (rev 7319)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,25 +24,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', array( __CLASS__, 'pre_get_posts' ), 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'posts_orderby', array( __CLASS__, 'search_posts_orderby' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_posts', array( __CLASS__, 'rerun_empty_exact_search' ), 10, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'query_vars', array( __CLASS__, 'default_qv_empty_post_type_search' ) );
</del><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">- * Add query var to indicate if no post type filters were explicitly used for
- * a search.
- *
- * Defaults the query var 'empty_post_type_search' to false. It is potentially
- * set to true elsewhere.
- *
- * @param array $public_query_vars The array of whitelisted query variables.
- * @return array
- */
- public static function default_qv_empty_post_type_search( $public_query_vars ) {
- $public_query_vars['empty_post_type_search'] = false;
- return $public_query_vars;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Query modifications.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param \WP_Query $query
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Separates searches for handbook pages from non-handbook pages depending on
</span><span class="cx" style="display: block; padding: 0 10px"> // whether the search was performed within context of a handbook page or not.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_query_var( 'is_handbook' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $query->is_handbook ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Search only in current handbook post type.
</span><span class="cx" style="display: block; padding: 0 10px"> // Just to make sure. post type should already be set.
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'post_type', wporg_get_current_handbook() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $qv_post_types ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Record the fact no post types were explicitly supplied.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query->set( 'empty_post_type_search', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query->is_empty_post_type_search = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Not a handbook page, or exact search, or filters used.
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback to parsed post types.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopersearchphp"></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/search.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/search.php 2018-06-19 07:50:49 UTC (rev 7318)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/search.php 2018-06-19 09:44:33 UTC (rev 7319)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="trail-browse"><span class="trail-begin"><?php _e( 'Search Results', 'wporg' ); ?></span></span><span class="sep">:</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span><a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Home', 'wporg' ); ?></a></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="sep">/</span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( get_query_var( 'is_handbook' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $GLOBALS['wp_query']->is_handbook ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span><a href="<?php echo esc_url( get_query_var( 'current_handbook_home_url' ) ); ?>"><?php echo get_query_var( 'current_handbook_name' ); ?></a></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $reference_page = get_page_by_path( 'reference' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span><a href="<?php echo esc_url( get_permalink( $reference_page ) ); ?>"><?php echo get_the_title( $reference_page ); ?></a></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Start the Loop */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php get_template_part( 'content', get_query_var( 'is_handbook' ) ? 'handbook-archive' : 'reference-archive' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php get_template_part( 'content', $GLOBALS['wp_query']->is_handbook ? 'handbook-archive' : 'reference-archive' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopersearchformphp"></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/searchform.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/searchform.php 2018-06-19 07:50:49 UTC (rev 7318)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/searchform.php 2018-06-19 09:44:33 UTC (rev 7319)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_handbook = get_query_var( 'is_handbook' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_handbook = $GLOBALS['wp_query']->is_handbook;
</ins><span class="cx" style="display: block; padding: 0 10px"> $search_url = get_query_var( 'current_handbook_home_url' );
</span><span class="cx" style="display: block; padding: 0 10px"> $search_url = $search_url ? $search_url : home_url( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $filters = ! ( $is_handbook || is_404() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,15 +59,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-parser-class' => __( 'Classes', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-parser-method' => __( 'Methods', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $qv_post_type = array_filter( (array) get_query_var( 'post_type' ) );
- $no_filters = get_query_var( 'empty_post_type_search' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qv_post_type = array_filter( (array) get_query_var( 'post_type' ) );
+ $no_filters = $GLOBALS['wp_query']->is_empty_post_type_search;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_search() || in_array( 'any', $qv_post_type ) || $no_filters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // No filters used.
</span><span class="cx" style="display: block; padding: 0 10px"> $qv_post_type = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> foreach ( $search_post_types as $post_type => $label ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $checked = checked( in_array( $post_type, $qv_post_type ), true, false );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>