Merge pull request woocommerce#25314 from woocommerce/fix/24746

Removed the lowercase conversion of product search terms

Author: rodrigoprimo

includes/data-stores/class-wc-product-data-store-cpt.php

@@ -880,7 +880,7 @@ public function get_on_sale_products() {
 		}
 
 		return $wpdb->get_results(
-			// phpcs:disable WordPress.DB.PreparedSQL.NotPrepared
+			// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			"
 			SELECT posts.ID as id, posts.post_parent as parent_id
 			FROM {$wpdb->posts} AS posts
@@ -898,7 +898,7 @@ public function get_on_sale_products() {
 			)
 			GROUP BY posts.ID
 			"
-			// phpcs:enable WordPress.DB.PreparedSQL.NotPrepared
+			// phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 		);
 	}
 
@@ -1553,7 +1553,6 @@ public function search_products( $term, $type = '', $include_variations = false,
 		$type_where   = '';
 		$status_where = '';
 		$limit_query  = '';
-		$term         = wc_strtolower( $term );
 
 		/**
 		 * Hook woocommerce_search_products_post_statuses.
@@ -1567,8 +1566,8 @@ public function search_products( $term, $type = '', $include_variations = false,
 		);
 
 		// See if search term contains OR keywords.
-		if ( strstr( $term, ' or ' ) ) {
-			$term_groups = explode( ' or ', $term );
+		if ( stristr( $term, ' or ' ) ) {
+			$term_groups = preg_split( '/\s+or\s+/i', $term );
 		} else {
 			$term_groups = array( $term );
 		}

tests/unit-tests/product/data-store.php

@@ -797,6 +797,12 @@ public function test_search_products() {
 		$this->assertContains( $product3->get_id(), $results );
 		$this->assertContains( $product4->get_id(), $results );
 
+		$results = $data_store->search_products( 'blue-widget-1     OR       green-widget', '', true, true );
+		$this->assertContains( $product->get_id(), $results );
+		$this->assertNotContains( $product2->get_id(), $results );
+		$this->assertContains( $product3->get_id(), $results );
+		$this->assertContains( $product4->get_id(), $results );
+
 		$results = $data_store->search_products( '"green widget"', '', true, true );
 		$this->assertNotContains( $product->get_id(), $results );
 		$this->assertNotContains( $product2->get_id(), $results );