<!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>[13349] sites/trunk/wordpress.org/public_html/wp-content: wporg-plugins-2024: Attempt to support retaining the filters for searches.</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/13349">13349</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/13349","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>2024-03-15 07:16:32 +0000 (Fri, 15 Mar 2024)</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'>wporg-plugins-2024: Attempt to support retaining the filters for searches.
This has many rough edges, as the UI doesn't match the WordPress template heirachy that was never designed for combination views.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024incblockconfigphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/plugin-directory/class-plugin-directory.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/plugin-directory/class-plugin-directory.php 2024-03-15 05:59:14 UTC (rev 13348)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2024-03-15 07:16:32 UTC (rev 13349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1021,8 +1021,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'ratings':
+ $wp_query->query_vars['orderby'] = 'num_ratings';
+ // Fall through.
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'num_ratings':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'ratings':
</del><span class="cx" style="display: block; padding: 0 10px"> $wp_query->query_vars['meta_query']['num_ratings'] ??= [
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'num_ratings',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'UNSIGNED',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,11 +1031,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => '>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $wp_query->query_vars['orderby'] = 'num_ratings';
</del><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case '_active_installs':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_query->query_vars['orderby'] = 'active_installs';
+ // Fall through.
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'active_installs':
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query->query_vars['meta_query']['active_installs'] ??= [
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => '_active_installs',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1040,8 +1042,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'UNSIGNED',
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => 'EXISTS'
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $wp_query->query_vars['orderby'] = 'active_installs';
</del><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'last_updated':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,7 +1066,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'UNSIGNED',
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => 'EXISTS',
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_query->query_vars['orderby'] = 'downloads';
</del><span class="cx" style="display: block; padding: 0 10px"> break;
</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">@@ -1467,9 +1466,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // New-style search links.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 's' ) && isset( $_GET['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' );
- if ( get_query_var( 'block_search' ) ) {
- $url = add_query_arg( 'block_search', get_query_var( 'block_search' ), $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' );
+ $query_vars = array_filter( $wp_query->query );
+
+ // Don't need the search..
+ unset( $query_vars['s'] );
+
+ // Temporary: Disable sorts for search.
+ unset( $query_vars['order'], $query_vars['orderby'] );
+
+ if ( ! empty( $query_vars ) ) {
+ $url = add_query_arg( $query_vars, $url );
</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"> wp_safe_redirect( $url, 301 );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024incblockconfigphp"></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-plugins-2024/inc/block-config.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-plugins-2024/inc/block-config.php 2024-03-15 05:59:14 UTC (rev 13348)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php 2024-03-15 07:16:32 UTC (rev 13349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,12 +129,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $array = is_array( $values );
</span><span class="cx" style="display: block; padding: 0 10px"> $values = (array) $values;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $values as $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Support for tax archives... TODO Hacky..
- // Realistically we should just ditch these and have all of the filters hit /search/?stuff=goes&here
- if ( is_tax() && $value === ( get_queried_object()->slug ?? '' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_search() && 's' === $query_var ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( is_search() && 's' === $query_var ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'plugin_tags' === $query_var ) {
+ // We don't support tags yet as a filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'browse' === $query_var ) {
+ // Don't retain if there's no actual items in the section (ie. it's dynamic).
+ $term = get_term_by( 'slug', $value, 'plugin_section' );
+ if ( ! $term || ! $term->count ) {
+ continue;
+ }
</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"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +150,11 @@
</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">+ // If this is a block directory search, that needs to be retained too.
+ if ( is_search() && get_query_var( 'block_search' ) ) {
+ echo '<input type="hidden" name="block_search" value="1" />';
+ }
+
</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"> function wporg_query_total_label( $label, $count ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +162,7 @@
</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">- * Filters the search block to remove required attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the search block to remove the required attribute, and add the query fields.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $block_content
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $block
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,5 +173,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $block_content;
</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">- return preg_replace( '/(<input[^>]*)\s+required\s*([^>]*)>/', '$1$2>', $block_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove the required attribute
+ $block_content = preg_replace( '/(<input[^>]*)\s+required\s*([^>]*)>/', '$1$2>', $block_content );
+
+ // Insert the current query filters into the search form.
+ ob_start();
+ wporg_query_filter_in_form( 's' );
+ $block_content = str_replace( '</form>', ob_get_clean() . '</form>', $block_content );
+
+ return $block_content;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>