Merge pull request #2783 from woocommerce/trunk

Release 2.9.7 - Merge `trunk` to `develop`
woocommerce · Jan 28, 2025 · 6cecf07 · 6cecf07
2 parents 6e15a75 + 936c874
commit 6cecf07
Show file tree

Hide file tree

Showing 6 changed files with 267 additions and 264 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,9 @@
 *** Google for WooCommerce Changelog ***
 
+= 2.9.7 - 2025-01-28 =
+* Tweak - Adjust some query and table functions.
+* Tweak - Allow mapping of a Google ID without a prefix.
+
 = 2.9.6 - 2025-01-21 =
 * Tweak - Resolve some of the plugin check errors and warnings.
 * Tweak - Set specific flags for html_entity_decode.

diff --git a/google-listings-and-ads.php b/google-listings-and-ads.php
@@ -3,7 +3,7 @@
  * Plugin Name: Google for WooCommerce
  * Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
  * Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
- * Version: 2.9.6
+ * Version: 2.9.7
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
  * Text Domain: google-listings-and-ads
@@ -33,7 +33,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.9.6' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.9.7' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '7.9' );
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "google-listings-and-ads",
 	"title": "Google for WooCommerce",
-	"version": "2.9.6",
+	"version": "2.9.7",
 	"description": "Google for WooCommerce",
 	"author": "Automattic",
 	"license": "GPL-3.0-or-later",

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Requires at least: 6.1
 Tested up to: 6.7
 Requires PHP: 7.4
 Requires PHP Architecture: 64 Bits
-Stable tag: 2.9.6
+Stable tag: 2.9.7
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -140,6 +140,10 @@ To allow your products to appear in all relevant locations, make sure you’ve c
 
 == Changelog ==
 
+= 2.9.7 - 2025-01-28 =
+* Tweak - Adjust some query and table functions.
+* Tweak - Allow mapping of a Google ID without a prefix.
+
 = 2.9.6 - 2025-01-21 =
 * Tweak - Resolve some of the plugin check errors and warnings.
 * Tweak - Set specific flags for html_entity_decode.
@@ -161,9 +165,4 @@ To allow your products to appear in all relevant locations, make sure you’ve c
 * Update - Move tax rate setup from the Edit free listings page to the Settings page.
 * Update - Move the Edit free listings page to a dedicated page and rename the page to Shipping.
 
-= 2.9.4 - 2024-12-25 =
-* Fix - Clear previous errors after completing sync.
-* Tweak - Adjust conditions for MCM.
-* Update - Google Ads API to v18.
-
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).