Revert fixes #46972 and #46860 and the readme.txt changes in between (#…

…47030)
woocommerce · Apr 29, 2024 · 42f693d · 42f693d
1 parent d815930
commit 42f693d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/plugins/woocommerce/readme.txt b/plugins/woocommerce/readme.txt
@@ -167,8 +167,6 @@ WooCommerce comes with some sample data you can use to see how products look; im
 
 = 8.8.3 2024-04-29 =
 
-* Fix - Fix HPOS order searches involving terms with characters resembling URL-encoded characters. [#46972](https://github.com/woocommerce/woocommerce/pull/46972)
-* Fix - Fixes order counts in the status widget for persistent caches. [#46860](https://github.com/woocommerce/woocommerce/pull/46860)
-* Update - Reverts auto-injecting specific Woo Blocks in every block theme and restores only auto-injecting in themes found in the allow list. [#46935](https://github.com/woocommerce/woocommerce/pull/46935)
+* Update - Reverts auto-injecting specific Woo Blocks in every block theme and restores only auto-injecting in themes found in the allow list. 
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/changelog.txt).
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableSearchQuery.php b/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableSearchQuery.php
@@ -27,7 +27,7 @@ class OrdersTableSearchQuery {
 	/**
 	 * Limits the search to a specific field.
 	 *
-	 * @var string[]
+	 * @var string
 	 */
 	private $search_filters;
 
@@ -40,8 +40,8 @@ class OrdersTableSearchQuery {
 	 */
 	public function __construct( OrdersTableQuery $query ) {
 		$this->query          = $query;
-		$this->search_term    = $query->get( 's' );
-		$this->search_filters = $this->sanitize_search_filters( $query->get( 'search_filter' ) ?? '' );
+		$this->search_term    = urldecode( $query->get( 's' ) );
+		$this->search_filters = $this->sanitize_search_filters( urldecode( $query->get( 'search_filter' ) ) );
 	}
 
 	/**

diff --git a/plugins/woocommerce/src/Utilities/OrderUtil.php b/plugins/woocommerce/src/Utilities/OrderUtil.php
@@ -196,8 +196,8 @@ public static function get_table_for_order_meta() {
 	public static function get_count_for_type( $order_type ) {
 		global $wpdb;
 
-		$cache_key        = \WC_Cache_Helper::get_cache_prefix( 'orders' ) . 'order-count-' . $order_type;
-		$count_per_status = wp_cache_get( $cache_key, 'counts' );
+		$cache_key        = 'order-count-' . $order_type;
+		$count_per_status = wp_cache_get( $cache_key, 'orders' );
 
 		if ( false === $count_per_status ) {
 			if ( self::custom_orders_table_usage_is_enabled() ) {
@@ -222,7 +222,7 @@ public static function get_count_for_type( $order_type ) {
 				$count_per_status
 			);
 
-			wp_cache_set( $cache_key, $count_per_status, 'counts' );
+			wp_cache_set( $cache_key, $count_per_status, 'orders' );
 		}
 
 		return $count_per_status;