Changeset 13778 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

Timestamp:

06/06/2024 04:13:41 AM (20 months ago)

Author:

dd32

Message:

Plugin Directory: Search: Improve the search code for phrase matching.

This does not add support for proper phrase matching in the search, but rather corrects the code to properly handle Jetpack Phrase search mode.

Previously most of the customizations in our search code was being skipped, as the structure of the Jetpack ES query was in an unexpected form.

See #2642.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -975 +975 @@
         // Sanitize / cleanup the search query a little bit.
         if ( $wp_query->is_search() ) {
-            $s = $wp_query->get( 's' );
+            $s = wp_unslash( $wp_query->get( 's' ) );
             $s = urldecode( $s );
 
@@ -988 +988 @@
             }
 
-            // Trim off special characters, only allowing wordy characters at the end of searches.
-            $s = preg_replace( '!(\W+)$!iu', '', $s );
-            // ..and whitespace
+            // Trim whitespace
             $s = trim( $s );
 
-            $wp_query->set( 's', $s );
+            // If we're searching for a phrase, only trim non-quotey+wordy characters.
+            if ( str_starts_with( $s, '"' ) || str_starts_with( $s, "'" ) ) {
+                $s = preg_replace( '!(\s*[^\'"\w]+)$!iu', '', $s );
+            } else {
+                // If we're searching for a word, trim all non-wordy characters.
+                $s = preg_replace( '!(\s*\W+)$!iu', '', $s );
+            }
+
+            $wp_query->set( 's', wp_slash( $s ) );
 
             // If the search is in the block directory, require that.