chore(release): merge in release v5.14.1

Automattic · Feb 18, 2025 · 32c10da · 32c10da
2 parents 49c4b35 + 259239f
commit 32c10da
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [5.14.1](https://github.com/Automattic/newspack-plugin/compare/v5.14.0...v5.14.1) (2025-02-18)
+
+
+### Bug Fixes
+
+* **esp-sync:** broken CLI sync command ([#3762](https://github.com/Automattic/newspack-plugin/issues/3762)) ([f609670](https://github.com/Automattic/newspack-plugin/commit/f6096706dfba077b13dd3e91687cb4e949ed50b5))
+
 # [5.14.0](https://github.com/Automattic/newspack-plugin/compare/v5.13.5...v5.14.0) (2025-02-17)
 
 

diff --git a/includes/cli/class-ras-esp-sync.php b/includes/cli/class-ras-esp-sync.php
@@ -178,6 +178,8 @@ private static function sync_contacts( $config ) {
 							$result->get_error_message()
 						)
 					);
+				} elseif ( ! empty( static::$results ) ) {
+					static::$results['processed']++;
 				}
 			}
 		}

diff --git a/includes/reader-activation/sync/class-esp-sync.php b/includes/reader-activation/sync/class-esp-sync.php
@@ -238,12 +238,9 @@ public static function sync_contact( $user_id_or_order, $is_dry_run = false ) {
 					// Translators: %1$s is the status and %2$s is the contact's email address.
 					__( '%1$s contact data for %2$s.', 'newspack-plugin' ),
 					$is_dry_run ? __( 'Would sync', 'newspack-plugin' ) : __( 'Synced', 'newspack-plugin' ),
-					$customer->get_email()
+					$contact['email']
 				)
 			);
-			if ( ! empty( static::$results ) ) {
-				static::$results['processed']++;
-			}
 		}
 
 		return $result;

diff --git a/newspack.php b/newspack.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Newspack
  * Description: An advanced open-source publishing and revenue-generating platform for news organizations.
- * Version: 5.14.0
+ * Version: 5.14.1
  * Author: Automattic
  * Author URI: https://newspack.com/
  * License: GPL2
@@ -14,7 +14,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'NEWSPACK_PLUGIN_VERSION', '5.14.0' );
+define( 'NEWSPACK_PLUGIN_VERSION', '5.14.1' );
 
 // Define NEWSPACK_PLUGIN_FILE.
 if ( ! defined( 'NEWSPACK_PLUGIN_FILE' ) ) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "newspack",
-	"version": "5.14.0",
+	"version": "5.14.1",
 	"description": "The Newspack plugin. https://newspack.com",
 	"bugs": {
 		"url": "https://github.com/Automattic/newspack-plugin/issues"
-Original file line number
+Diff line change
@@ Expand Up / @@ -178,6 +178,8 @@ private static function sync_contacts( $config ) { @@
     							$result->get_error_message()
     						)
     					);
+    				} elseif ( ! empty( static::$results ) ) {
+    					static::$results['processed']++;
     				}
     			}
     		}
@@ Expand Down @@