Merge pull request #1106 from Automattic/release/3.6.4

Release/3.6.4

Author: NickGreen

.github/workflows/deploy.yml

@@ -11,6 +11,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
+      - name: Install SVN (Subversion)
+        run: |
+          sudo apt-get update
+          sudo apt-get install subversion
+
       - name: Push to WordPress.org
         uses: 10up/action-wordpress-plugin-deploy@stable
         env:

.github/workflows/integrate.yml

@@ -36,6 +36,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install SVN (Subversion)
+         run: |
+           sudo apt-get update
+           sudo apt-get install subversion
+           
       - name: Set up PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2
         with:

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.6.4] - 2025-03-24
+
+### Fixed
+* Protect against duplicate authors being added to patterns and parent posts when a synced pattern is edited. #1103
+
+### Maintenance
+* Increase composer/installers version #1104
+* Add SVN install to integrate workflow #1105
+
 ## [3.6.3] - 2024-10-25
 
 ### Fixed
@@ -514,6 +523,7 @@ Props to the many people who helped make this release possible: [catchmyfame](ht
 **1.1.0 (Apr. 14, 2009)**
 * Initial beta release.
 
+[3.6.4]: https://github.com/automattic/co-authors-plus/compare/3.6.3...3.6.4
 [3.6.3]: https://github.com/automattic/co-authors-plus/compare/3.6.2...3.6.3
 [3.6.2]: https://github.com/automattic/co-authors-plus/compare/3.6.1...3.6.2
 [3.6.1]: https://github.com/automattic/co-authors-plus/compare/3.6.0...3.6.1

README.md

@@ -1,6 +1,6 @@
 # Co-Authors Plus
 
-Stable tag: 3.6.3
+Stable tag: 3.6.4
 Requires at least: 5.9
 Tested up to: 6.6
 Requires PHP: 7.4

co-authors-plus.php

@@ -11,7 +11,7 @@
  * Plugin Name:       Co-Authors Plus
  * Plugin URI:        https://wordpress.org/plugins/co-authors-plus/
  * Description:       Allows multiple authors to be assigned to a post. This plugin is an extended version of the Co-Authors plugin developed by Weston Ruter.
- * Version:           3.6.3
+ * Version:           3.6.4
  * Requires at least: 5.9
  * Requires PHP:      7.4
  * Author:            Mohammad Jangda, Daniel Bachhuber, Automattic
@@ -21,7 +21,7 @@
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-const COAUTHORS_PLUS_VERSION = '3.6.3';
+const COAUTHORS_PLUS_VERSION = '3.6.4';
 const COAUTHORS_PLUS_FILE = __FILE__;
 
 require_once __DIR__ . '/template-tags.php';

composer.json

@@ -22,7 +22,7 @@
 		"forum": "https://wordpress.org/support/plugin/co-authors-plus"
 	},
 	"require": {
-		"composer/installers": "~1.0",
+		"composer/installers": "^2",
 		"php": ">=7.4"
 	},
 	"require-dev": {

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "co-authors-plus",
-	"version": "3.6.3",
+	"version": "3.6.4",
 	"description": "Allows multiple authors to be assigned to a post.",
 	"license": "GPL-2.0-or-later",
 	"private": true,

package.json

@@ -152,7 +152,9 @@ public function get_coauthors_search_results( $request ): WP_REST_Response {
 	public function get_coauthors( $request ): WP_REST_Response {
 		$response = array();
 
-		$this->_build_authors_response( $response, $request );
+		if ( ! $this->request_is_for_wp_block_post_type( $request ) && ! $this->is_pattern_sync_operation() ) {
+			$this->_build_authors_response( $response, $request );
+		}
 
 		return rest_ensure_response( $response );
 	}
@@ -233,6 +235,36 @@ public function _build_authors_response( &$response, $request ): void {
 		}
 	}
 
+	/**
+	 * Check if the request is for a wp_block post type.
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return bool
+	 */
+	private function request_is_for_wp_block_post_type( WP_REST_Request $request ): bool {
+		return 'wp_block' === get_post_type( $request->get_param( 'post_id' ) );
+	}
+
+	/**
+	 * Check if this is a pattern sync operation.
+	 *
+	 * @return bool
+	 */
+	private function is_pattern_sync_operation(): bool {
+		$referer = wp_get_referer();
+		if ( ! $referer ) {
+			return false;
+		}
+
+		$query_string = wp_parse_url( $referer, PHP_URL_QUERY );
+		if ( ! $query_string ) {
+			return false;
+		}
+
+		parse_str( $query_string, $query_vars );
+		return ! empty( $query_vars['post'] ) && 'wp_block' === get_post_type( $query_vars['post'] );
+	}
+
 	/**
 	 * Add filters to REST endpoints for each post that
 	 * supports co-authors.

php/class-coauthors-endpoint.php

@@ -243,6 +243,7 @@ public function admin_init(): void {
 
 		// Apply some targeted filters
 		add_action( 'load-edit.php', array( $this, 'load_edit' ) );
+		add_action( 'load-users.php', array( $this, 'load_users_screen' ) );
 	}
 
 	/**
@@ -1509,6 +1510,31 @@ public function filter_views( $views ) {
 		return $views;
 	}
 
+	/**
+	 * Prevent WordPress from counting users' posts for Users table column that
+	 * is removed by the `_filter_manage_users_columns` method.
+	 *
+	 * @return void
+	 */
+	public function load_users_screen(): void {
+		add_filter( 'pre_count_many_users_posts', array( $this, 'bypass_user_post_count' ), 10, 2 );
+	}
+
+	/**
+	 * Return empty counts for `count_users_many_posts()`, to bypass the heavy
+	 * and unused query results.
+	 *
+	 * @param string[]|null $counts   Post counts.
+	 * @param array         $user_ids User IDs to return counts for.
+	 * @return array
+	 */
+	public function bypass_user_post_count( $counts, $user_ids ) {
+		return array_fill_keys(
+			array_map( 'absint', $user_ids ),
+			0
+		);
+	}
+
 	/**
 	 * Adds necessary javascript variables to admin pages
 	 */