Changeset 3747745

Timestamp:

10/15/2026 07:02:52 AM (11 days ago)

Author:

doofinder

Message:

Update to version 2.17.2 from GitHub

Location:

doofinder-for-woocommerce

Files:

• tags/2.17.2 (copied) (copied from doofinder-for-woocommerce/trunk )
• tags/2.17.2/doofinder-for-woocommerce.php (modified) (2 diffs)
• tags/2.17.2/includes/api/endpoints/class-endpoint-product.php (modified) (1 diff)
• tags/2.17.2/includes/class-doofinder-constants.php (modified) (1 diff)
• tags/2.17.2/readme.txt (modified) (2 diffs)
• trunk/doofinder-for-woocommerce.php (modified) (2 diffs)
• trunk/includes/api/endpoints/class-endpoint-product.php (modified) (1 diff)
• trunk/includes/class-doofinder-constants.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

doofinder-for-woocommerce/tags/2.17.2/doofinder-for-woocommerce.php

@@ -4 +4 @@
  * License: MIT
  * License URI: https://opensource.org/licenses/MIT
- * Version: 2.17.1
+ * Version: 2.17.2
  * Requires at least: 5.6
  * Requires PHP: 7.0
@@ -45 +45 @@
                  */
 
-                public static $version = '2.17.1';
+                public static $version = '2.17.2';
 
                 /**

doofinder-for-woocommerce/tags/2.17.2/includes/api/endpoints/class-endpoint-product.php

@@ -655 +655 @@
                         )
                 );
-                $original_response = rest_do_request( $request );
+                $original_response = self::with_requested_ordering(
+                        function () use ( $request ) {
+                                return rest_do_request( $request );
+                        }
+                );
                 return $original_response->data;
+        }
+
+        /**
+         * Run a callback with the catalog ordering WooCommerce derives from the request,
+         * whatever other plugins do to it.
+         *
+         * Paginating by offset needs a stable order. Plugins that sort the catalog (for example by
+         * `menu_order`) hook into `woocommerce_get_catalog_ordering_args` and also rewrite the
+         * ordering of `/wc/v3/products`, so pages overlap and some products are never returned.
+         * The arguments WooCommerce computes are saved before any other callback runs and put
+         * back after all of them.
+         *
+         * @param callable $callback The code that queries the products.
+         * @return mixed What the callback returns.
+         */
+        private static function with_requested_ordering( $callback ) {
+                $requested_args = null;
+
+                $save_requested_args = function ( $args ) use ( &$requested_args ) {
+                        $requested_args = $args;
+                        return $args;
+                };
+
+                $restore_requested_args = function ( $args ) use ( &$requested_args ) {
+                        return null === $requested_args ? $args : $requested_args;
+                };
+
+                add_filter( 'woocommerce_get_catalog_ordering_args', $save_requested_args, PHP_INT_MIN );
+                add_filter( 'woocommerce_get_catalog_ordering_args', $restore_requested_args, PHP_INT_MAX );
+
+                try {
+                        return $callback();
+                } finally {
+                        remove_filter( 'woocommerce_get_catalog_ordering_args', $save_requested_args, PHP_INT_MIN );
+                        remove_filter( 'woocommerce_get_catalog_ordering_args', $restore_requested_args, PHP_INT_MAX );
+                }
         }
 

doofinder-for-woocommerce/tags/2.17.2/includes/class-doofinder-constants.php

@@ -24 +24 @@
 class Doofinder_Constants {
 
-        const VERSION            = '2.17.1';
+        const VERSION            = '2.17.2';
         const PLUGINS_URL_FORMAT = 'https://%splugins.doofinder.com';
         const API_URL_FORMAT     = 'https://%sadmin.doofinder.com';

doofinder-for-woocommerce/tags/2.17.2/readme.txt

@@ -2 +2 @@
 Contributors: Doofinder
 Tags: search, autocomplete
-Version: 2.17.1
+Version: 2.17.2
 Requires at least: 5.6
 Tested up to: 6.9
 Requires PHP: 7.0
-Stable tag: 2.17.1
+Stable tag: 2.17.2
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -127 +127 @@
 == Changelog ==
 
+= 2.17.2 =
+- Fixed products missing from the index when another plugin changes the ordering of the catalog.
+
 = 2.17.1 =
 - Fixed the indexed price being 0 for products whose regular price is 0 but are sold at another price.

doofinder-for-woocommerce/trunk/doofinder-for-woocommerce.php

@@ -4 +4 @@
  * License: MIT
  * License URI: https://opensource.org/licenses/MIT
- * Version: 2.17.1
+ * Version: 2.17.2
  * Requires at least: 5.6
  * Requires PHP: 7.0
@@ -45 +45 @@
                  */
 
-                public static $version = '2.17.1';
+                public static $version = '2.17.2';
 
                 /**

doofinder-for-woocommerce/trunk/includes/api/endpoints/class-endpoint-product.php

@@ -655 +655 @@
                         )
                 );
-                $original_response = rest_do_request( $request );
+                $original_response = self::with_requested_ordering(
+                        function () use ( $request ) {
+                                return rest_do_request( $request );
+                        }
+                );
                 return $original_response->data;
+        }
+
+        /**
+         * Run a callback with the catalog ordering WooCommerce derives from the request,
+         * whatever other plugins do to it.
+         *
+         * Paginating by offset needs a stable order. Plugins that sort the catalog (for example by
+         * `menu_order`) hook into `woocommerce_get_catalog_ordering_args` and also rewrite the
+         * ordering of `/wc/v3/products`, so pages overlap and some products are never returned.
+         * The arguments WooCommerce computes are saved before any other callback runs and put
+         * back after all of them.
+         *
+         * @param callable $callback The code that queries the products.
+         * @return mixed What the callback returns.
+         */
+        private static function with_requested_ordering( $callback ) {
+                $requested_args = null;
+
+                $save_requested_args = function ( $args ) use ( &$requested_args ) {
+                        $requested_args = $args;
+                        return $args;
+                };
+
+                $restore_requested_args = function ( $args ) use ( &$requested_args ) {
+                        return null === $requested_args ? $args : $requested_args;
+                };
+
+                add_filter( 'woocommerce_get_catalog_ordering_args', $save_requested_args, PHP_INT_MIN );
+                add_filter( 'woocommerce_get_catalog_ordering_args', $restore_requested_args, PHP_INT_MAX );
+
+                try {
+                        return $callback();
+                } finally {
+                        remove_filter( 'woocommerce_get_catalog_ordering_args', $save_requested_args, PHP_INT_MIN );
+                        remove_filter( 'woocommerce_get_catalog_ordering_args', $restore_requested_args, PHP_INT_MAX );
+                }
         }
 

doofinder-for-woocommerce/trunk/includes/class-doofinder-constants.php

@@ -24 +24 @@
 class Doofinder_Constants {
 
-        const VERSION            = '2.17.1';
+        const VERSION            = '2.17.2';
         const PLUGINS_URL_FORMAT = 'https://%splugins.doofinder.com';
         const API_URL_FORMAT     = 'https://%sadmin.doofinder.com';

doofinder-for-woocommerce/trunk/readme.txt

@@ -2 +2 @@
 Contributors: Doofinder
 Tags: search, autocomplete
-Version: 2.17.1
+Version: 2.17.2
 Requires at least: 5.6
 Tested up to: 6.9
 Requires PHP: 7.0
-Stable tag: 2.17.1
+Stable tag: 2.17.2
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -127 +127 @@
 == Changelog ==
 
+= 2.17.2 =
+- Fixed products missing from the index when another plugin changes the ordering of the catalog.
+
 = 2.17.1 =
 - Fixed the indexed price being 0 for products whose regular price is 0 but are sold at another price.