Tweak WP_Query to add starts_with parameter and refine 404 redirect logic

Author: spacedmonkey

src/wp-includes/canonical.php

@@ -919,13 +919,9 @@ function strip_fragment_from_url( $url ) {
  *
  * @since 2.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return string|false The correct URL if one is found. False on failure.
  */
 function redirect_guess_404_permalink() {
-	global $wpdb;
-
 	/**
 	 * Filters whether to attempt to guess a redirect URL for a 404 request.
 	 *
@@ -980,14 +976,16 @@ function redirect_guess_404_permalink() {
 			'update_post_meta_cache' => false,
 			'update_post_term_cache' => false,
 			'fields'                 => 'ids',
+			'orderby'                => 'none',
 		);
 
 		// Handle strict vs. loose post_name matching.
 		if ( $strict_guess ) {
 			$query_args['name'] = get_query_var( 'name' );
 		} else {
-			$query_args['s']              = get_query_var( 's' );
+			$query_args['s']              = get_query_var( 'name' );
 			$query_args['search_columns'] = array( 'post_name' );
+			$query_args['starts_with']    = true;
 		}
 
 		// If any of post_type, year, monthnum, or day are set, use them to refine the query.
@@ -1025,11 +1023,6 @@ function redirect_guess_404_permalink() {
 
 		$query = new WP_Query( $query_args );
 
-		// Clean up the filter if we added it (remove only our specific callback).
-		if ( ! $strict_guess && isset( $post_name_where_filter ) ) {
-			remove_filter( 'posts_where', $post_name_where_filter, 10 );
-		}
-
 		if ( empty( $query->posts ) ) {
 			return false;
 		}

src/wp-includes/class-wp-query.php

@@ -660,6 +660,7 @@ public function fill_query_vars( $query_vars ) {
 	 * @since 5.3.0 Introduced the `$meta_type_key` parameter.
 	 * @since 6.1.0 Introduced the `$update_menu_item_cache` parameter.
 	 * @since 6.2.0 Introduced the `$search_columns` parameter.
+	 * @since 7.0.0 Introduced the `$starts_with` parameter.
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or string of Query parameters.
@@ -686,6 +687,7 @@ public function fill_query_vars( $query_vars ) {
 	 *                                                   See WP_Date_Query::__construct().
 	 *     @type int             $day                    Day of the month. Default empty. Accepts numbers 1-31.
 	 *     @type bool            $exact                  Whether to search by exact keyword. Default false.
+	 *     @type bool            $starts_with            Whether to search start with keyword. Default false.
 	 *     @type string          $fields                 Post fields to query for. Accepts:
 	 *                                                   - '' Returns an array of complete post objects (`WP_Post[]`).
 	 *                                                   - 'ids' Returns an array of post IDs (`int[]`).
@@ -1448,7 +1450,15 @@ protected function parse_search( &$query_vars ) {
 			}
 		}
 
-		$n                                  = ! empty( $query_vars['exact'] ) ? '' : '%';
+		$start = '%';
+		$end   = '%';
+		if ( ! empty( $query_vars['exact'] ) ) {
+			$start = '';
+			$end   = '';
+		} elseif ( ! empty( $query_vars['starts_with'] ) ) {
+			$start = '';
+		}
+
 		$searchand                          = '';
 		$query_vars['search_orderby_title'] = array();
 
@@ -1502,12 +1512,12 @@ protected function parse_search( &$query_vars ) {
 				$andor_op = 'OR';
 			}
 
-			if ( $n && ! $exclude ) {
+			if ( $end && ! $exclude ) {
 				$like                                 = '%' . $wpdb->esc_like( $term ) . '%';
 				$query_vars['search_orderby_title'][] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $like );
 			}
 
-			$like = $n . $wpdb->esc_like( $term ) . $n;
+			$like = $start . $wpdb->esc_like( $term ) . $end;
 
 			$search_columns_parts = array();
 			foreach ( $search_columns as $search_column ) {