Update WooCommerce plugin from 9.2.1 to 9.2.2

wp-content/plugins/woocommerce/i18n/languages/woocommerce.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce 9.2.1\n"
+"Project-Id-Version: WooCommerce 9.2.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-08-20T23:31:42+00:00\n"
+"POT-Creation-Date: 2024-08-22T14:58:22+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: woocommerce\n"
@@ -10645,7 +10645,7 @@ msgstr ""
 
 #: includes/admin/class-wc-admin-menus.php:123
 #: includes/admin/views/html-admin-page-status-report.php:693
-#: includes/class-wc-install.php:2181
+#: includes/class-wc-install.php:2180
 #: includes/react-admin/connect-existing-pages.php:35
 #: src/Admin/Features/Navigation/CoreMenu.php:126
 #: src/Internal/Admin/Analytics.php:305
@@ -21059,99 +21059,99 @@ msgid "Zero rate"
 msgstr ""
 
 #. translators: 1 = URL of Legacy REST API plugin page, 2 = URL of Legacy API settings in current site, 3 = URL of webhooks settings in current site, 4 = URL of logs page in current site, 5 = URL of plugins page in current site, 6 = URL of blog post about the Legacy REST API removal
-#: includes/class-wc-install.php:1317
+#: includes/class-wc-install.php:1316
 msgid "⚠️ WooCommerce installed <a href=\"%1$s\">the Legacy REST API plugin</a> because this site has <a href=\"%2$s\">the Legacy REST API enabled</a> or has <a href=\"%3$s\">legacy webhooks defined</a>, but it failed to activate it (see error details in <a href=\"%4$s\">the WooCommerce logs</a>). Please go to <a href=\"%5$s\">the plugins page</a> and activate it manually. <a href=\"%6$s\">More information</a>"
 msgstr ""
 
-#: includes/class-wc-install.php:1327
+#: includes/class-wc-install.php:1326
 msgid "WooCommerce installed the Legacy REST API plugin but failed to activate it, see context for more details."
 msgstr ""
 
 #. translators: 1 = URL of Legacy REST API plugin page, 2 = URL of Legacy API settings in current site, 3 = URL of webhooks settings in current site, 4 = URL of blog post about the Legacy REST API removal
-#: includes/class-wc-install.php:1336
+#: includes/class-wc-install.php:1335
 msgid "ℹ️ WooCommerce installed and activated <a href=\"%1$s\">the Legacy REST API plugin</a> because this site has <a href=\"%2$s\">the Legacy REST API enabled</a> or has <a href=\"%3$s\">legacy webhooks defined</a>. <a href=\"%4$s\">More information</a>"
 msgstr ""
 
 #. translators: 1 = URL of Legacy REST API plugin page, 2 = URL of Legacy API settings in current site, 3 = URL of webhooks settings in current site, 4 = URL of logs page in current site, 5 = URL of blog post about the Legacy REST API removal
-#: includes/class-wc-install.php:1350
+#: includes/class-wc-install.php:1349
 msgid "⚠️ WooCommerce attempted to install <a href=\"%1$s\">the Legacy REST API plugin</a> because this site has <a href=\"%2$s\">the Legacy REST API enabled</a> or has <a href=\"%3$s\">legacy webhooks defined</a>, but the installation failed (see error details in <a href=\"%4$s\">the WooCommerce logs</a>). Please install and activate the plugin manually. <a href=\"%5$s\">More information</a>"
 msgstr ""
 
 #. translators: user role
-#: includes/class-wc-install.php:1932
+#: includes/class-wc-install.php:1931
 msgctxt "User role"
 msgid "Customer"
 msgstr ""
 
 #. translators: user role
-#: includes/class-wc-install.php:1934
+#: includes/class-wc-install.php:1933
 msgctxt "User role"
 msgid "Shop manager"
 msgstr ""
 
-#: includes/class-wc-install.php:2181
+#: includes/class-wc-install.php:2180
 msgid "View WooCommerce settings"
 msgstr ""
 
-#: includes/class-wc-install.php:2229
+#: includes/class-wc-install.php:2228
 msgid "View WooCommerce documentation"
 msgstr ""
 
-#: includes/class-wc-install.php:2229
+#: includes/class-wc-install.php:2228
 msgid "Docs"
 msgstr ""
 
-#: includes/class-wc-install.php:2230
+#: includes/class-wc-install.php:2229
 msgid "View WooCommerce API docs"
 msgstr ""
 
-#: includes/class-wc-install.php:2230
+#: includes/class-wc-install.php:2229
 msgid "API docs"
 msgstr ""
 
-#: includes/class-wc-install.php:2231
+#: includes/class-wc-install.php:2230
 msgid "Visit community forums"
 msgstr ""
 
-#: includes/class-wc-install.php:2231
+#: includes/class-wc-install.php:2230
 msgid "Community support"
 msgstr ""
 
-#: includes/class-wc-install.php:2235
+#: includes/class-wc-install.php:2234
 msgid "Visit premium customer support"
 msgstr ""
 
-#: includes/class-wc-install.php:2235
+#: includes/class-wc-install.php:2234
 msgid "Premium support"
 msgstr ""
 
 #. translators: 1: plugin name, 2: error message, 3: URL to install plugin manually.
 #. translators: 1: theme slug, 2: error message, 3: URL to install theme manually.
-#: includes/class-wc-install.php:2363
-#: includes/class-wc-install.php:2467
+#: includes/class-wc-install.php:2362
+#: includes/class-wc-install.php:2466
 msgid "%1$s could not be installed (%2$s). <a href=\"%3$s\">Please install it manually by clicking here.</a>"
 msgstr ""
 
 #. translators: 1: plugin name, 2: URL to WP plugin page.
-#: includes/class-wc-install.php:2391
+#: includes/class-wc-install.php:2390
 msgid "%1$s was installed but could not be activated. <a href=\"%2$s\">Please activate it manually by clicking here.</a>"
 msgstr ""
 
-#: includes/class-wc-install.php:2698
+#: includes/class-wc-install.php:2697
 #: src/Blocks/BlockTypes/Cart.php:69
 #: assets/client/blocks/cart.js:12
 msgid "You may be interested in…"
 msgstr ""
 
-#: includes/class-wc-install.php:2754
+#: includes/class-wc-install.php:2753
 #: src/Blocks/BlockTypes/Cart.php:78
 #: src/Blocks/BlockTypes/MiniCart.php:590
 #: assets/client/blocks/cart.js:19
 #: assets/client/blocks/checkout-frontend.js:1
 msgid "Your cart is currently empty!"
 msgstr ""
 
-#: includes/class-wc-install.php:2762
+#: includes/class-wc-install.php:2761
 #: src/Blocks/BlockTypes/Cart.php:88
 #: assets/client/blocks/cart.js:19
 msgid "New in store"
@@ -28475,27 +28475,27 @@ msgstr ""
 msgid "cURL installed but unable to retrieve version."
 msgstr ""
 
-#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1368
+#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1373
 msgctxt "Page setting"
 msgid "Shop base"
 msgstr ""
 
-#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1373
+#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1378
 msgctxt "Page setting"
 msgid "Cart"
 msgstr ""
 
-#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1378
+#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1383
 msgctxt "Page setting"
 msgid "Checkout"
 msgstr ""
 
-#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1383
+#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1388
 msgctxt "Page setting"
 msgid "My account"
 msgstr ""
 
-#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1388
+#: includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php:1393
 msgctxt "Page setting"
 msgid "Terms and conditions"
 msgstr ""
@@ -40083,12 +40083,12 @@ msgid "String processors must be an array of valid callbacks."
 msgstr ""
 
 #. translators: 1 = who installed the plugin, 2 = ISO-formatted date and time, 3 = URL
-#: src/Internal/Utilities/PluginInstaller.php:256
+#: src/Internal/Utilities/PluginInstaller.php:249
 msgid "Plugin installed by %1$s on %2$s. <a target=\"_blank\" href=\"%3$s\">More information</a>"
 msgstr ""
 
 #. translators: 1 = who installed the plugin, 2 = ISO-formatted date and time
-#: src/Internal/Utilities/PluginInstaller.php:259
+#: src/Internal/Utilities/PluginInstaller.php:252
 msgid "Plugin installed by %1$s on %2$s."
 msgstr ""
 

wp-content/plugins/woocommerce/includes/admin/class-wc-admin-assets.php

@@ -149,7 +149,7 @@ public function admin_scripts() {
 			wp_register_script( 'wc-shipping-zone-methods', WC()->plugin_url() . '/assets/js/admin/wc-shipping-zone-methods' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone', 'jquery-ui-sortable', 'wc-backbone-modal' ), $version );
 			wp_register_script( 'wc-shipping-classes', WC()->plugin_url() . '/assets/js/admin/wc-shipping-classes' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone', 'wc-backbone-modal' ), $version, array( 'in_footer' => false ) );
 			wp_register_script( 'wc-clipboard', WC()->plugin_url() . '/assets/js/admin/wc-clipboard' . $suffix . '.js', array( 'jquery' ), $version );
-			wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/selectWoo/selectWoo.full' . $suffix . '.js', array( 'jquery' ), '1.0.6' );
+			wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), '4.0.3' );
 			wp_register_script( 'selectWoo', WC()->plugin_url() . '/assets/js/selectWoo/selectWoo.full' . $suffix . '.js', array( 'jquery' ), '1.0.6' );
 			wp_register_script( 'wc-enhanced-select', WC()->plugin_url() . '/assets/js/admin/wc-enhanced-select' . $suffix . '.js', array( 'jquery', 'selectWoo' ), $version );
 			wp_register_script( 'js-cookie', WC()->plugin_url() . '/assets/js/js-cookie/js.cookie' . $suffix . '.js', array(), '2.1.4', true );

wp-content/plugins/woocommerce/includes/class-wc-frontend-scripts.php

@@ -234,9 +234,9 @@ private static function register_scripts() {
 				'version' => $version,
 			),
 			'select2'                    => array(
-				'src'     => self::get_asset_url( 'assets/js/selectWoo/selectWoo.full' . $suffix . '.js' ),
+				'src'     => self::get_asset_url( 'assets/js/select2/select2.full' . $suffix . '.js' ),
 				'deps'    => array( 'jquery' ),
-				'version' => '1.0.9-wc.' . $version,
+				'version' => '4.0.3-wc.' . $version,
 			),
 			'selectWoo'                  => array(
 				'src'     => self::get_asset_url( 'assets/js/selectWoo/selectWoo.full' . $suffix . '.js' ),

wp-content/plugins/woocommerce/includes/class-wc-install.php

@@ -17,7 +17,7 @@
 use Automattic\WooCommerce\Internal\Utilities\DatabaseUtil;
 use Automattic\WooCommerce\Internal\WCCom\ConnectionHelper as WCConnectionHelper;
 use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
-use Automattic\WooCommerce\Utilities\{ OrderUtil, PluginUtil };
+use Automattic\WooCommerce\Utilities\OrderUtil;
 use Automattic\WooCommerce\Internal\Utilities\PluginInstaller;
 
 defined( 'ABSPATH' ) || exit;
@@ -1267,8 +1267,7 @@ private static function maybe_install_legacy_api_plugin() {
 				return;
 			}
 
-			$active_valid_plugins = wc_get_container()->get( PluginUtil::class )->get_all_active_valid_plugins();
-			if ( in_array( $legacy_api_plugin, $active_valid_plugins, true ) ) {
+			if ( in_array( $legacy_api_plugin, wp_get_active_and_valid_plugins(), true ) ) {
 				return;
 			}
 

wp-content/plugins/woocommerce/includes/class-woocommerce.php

@@ -43,7 +43,7 @@ final class WooCommerce {
 	 *
 	 * @var string
 	 */
-	public $version = '9.2.1';
+	public $version = '9.2.2';
 
 	/**
 	 * WooCommerce Schema version.

wp-content/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php

@@ -13,7 +13,7 @@
 use Automattic\WooCommerce\Internal\WCCom\ConnectionHelper;
 use Automattic\WooCommerce\Internal\ProductDownloads\ApprovedDirectories\Register as Download_Directories;
 use Automattic\WooCommerce\Internal\DataStores\Orders\DataSynchronizer as Order_DataSynchronizer;
-use Automattic\WooCommerce\Utilities\{ LoggingUtil, OrderUtil, PluginUtil };
+use Automattic\WooCommerce\Utilities\{ LoggingUtil, OrderUtil };
 
 /**
  * System status controller class.
@@ -1044,11 +1044,16 @@ public function get_active_plugins() {
 				return array();
 			}
 
-			$active_valid_plugins = wc_get_container()->get( PluginUtil::class )->get_all_active_valid_plugins();
-			$active_plugins_data  = array();
+			$active_plugins = (array) get_option( 'active_plugins', array() );
+			if ( is_multisite() ) {
+				$network_activated_plugins = array_keys( get_site_option( 'active_sitewide_plugins', array() ) );
+				$active_plugins            = array_merge( $active_plugins, $network_activated_plugins );
+			}
+
+			$active_plugins_data = array();
 
-			foreach ( $active_valid_plugins as $plugin ) {
-				$data                  = get_plugin_data( $plugin );
+			foreach ( $active_plugins as $plugin ) {
+				$data                  = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
 				$active_plugins_data[] = $this->format_plugin_data( $plugin, $data );
 			}
 

wp-content/plugins/woocommerce/readme.txt

@@ -4,7 +4,7 @@ Tags: online store, ecommerce, shop, shopping cart, sell online
 Requires at least: 6.5
 Tested up to: 6.6
 Requires PHP: 7.4
-Stable tag: 9.1.4
+Stable tag: 9.2.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -169,11 +169,12 @@ WooCommerce comes with some sample data you can use to see how products look; im
 
 == Changelog ==
 
-= 9.2.1 2024-08-21 =
+= 9.2.2 2024-08-22 =
 
 **WooCommerce**
 
-* Fix - Revert turning of AccessiblePrivateMethods::_accessible_private_methods into a static property because it caused fatal errors in some edge cases. [#50809](https://github.com/woocommerce/woocommerce/pull/50809)
+* Fix - Revert PR#48731 to address possible issues with plugins using WC's bundled select2 package. [#50854](https://github.com/woocommerce/woocommerce/pull/50854)
+* Fix - Partially revert PR#48709 as it could cause issues for some users of the REST API system_status endpoint. [#50881](https://github.com/woocommerce/woocommerce/pull/50881)
 
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/changelog.txt).

wp-content/plugins/woocommerce/src/Internal/Utilities/PluginInstaller.php

@@ -4,7 +4,7 @@
 
 use Automattic\WooCommerce\Internal\RegisterHooksInterface;
 use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
-use Automattic\WooCommerce\Utilities\{ PluginUtil, StringUtil };
+use Automattic\WooCommerce\Utilities\StringUtil;
 
 /**
  * This class allows installing a plugin programmatically.
@@ -206,14 +206,7 @@ private function install_plugin_core( string $plugin_url, array $metadata ): arr
 	 * @return bool True if WooCommerce is installed and active in the current blog, false otherwise.
 	 */
 	private static function woocommerce_is_active_in_current_site(): bool {
-		$active_valid_plugins = wc_get_container()->get( PluginUtil::class )->get_all_active_valid_plugins();
-
-		return ! empty(
-			array_filter(
-				$active_valid_plugins,
-				fn( $plugin ) => substr_compare( $plugin, '/woocommerce.php', -strlen( '/woocommerce.php' ) ) === 0
-			)
-		);
+		return ! empty( array_filter( wp_get_active_and_valid_plugins(), fn( $plugin ) => substr_compare( $plugin, '/woocommerce.php', -strlen( '/woocommerce.php' ) ) === 0 ) );
 	}
 
 	/**

wp-content/plugins/woocommerce/vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'woocommerce/woocommerce',
-        'pretty_version' => '9.2.1',
-        'version' => '9.2.1.0',
+        'pretty_version' => '9.2.2',
+        'version' => '9.2.2.0',
         'reference' => null,
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -167,8 +167,8 @@
             'dev_requirement' => false,
         ),
         'woocommerce/woocommerce' => array(
-            'pretty_version' => '9.2.1',
-            'version' => '9.2.1.0',
+            'pretty_version' => '9.2.2',
+            'version' => '9.2.2.0',
             'reference' => null,
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',