Committing built version of 90a5629

Author: 10upbot on GitHub

.github/workflows/cypress.yml

@@ -47,11 +47,11 @@ jobs:
           - {name: 'PHP Default', version: null}
         core:
           - {name: 'WP stable', version: 'latest'}
-          - {name: 'WP 6.4', version: 'WordPress/WordPress#6.4'}
+          - {name: 'WP minimum', version: 'WordPress/WordPress#6.5'}
           - {name: 'WP trunk', version: 'WordPress/WordPress#master'}
         include:
           - php: {name: 'PHP 7.4', version: '7.4'}
-            core: {name: 'WP 6.4', version: 'WordPress/WordPress#6.4'}
+            core: {name: 'WP minimum', version: 'WordPress/WordPress#6.5'}
           - php: {name: 'PHP 8.1', version: '8.1'}
             core: {name: 'WP stable', version: 'latest'}
     steps:
@@ -78,6 +78,26 @@ jobs:
     - name: Install dependencies
       run: npm install
 
+    - name: Get composer cache directory
+      id: composer-cache
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache dependencies
+      id: cache-composer
+      uses: actions/cache@v4
+      env:
+        cache-name: cache-composer
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
+
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php.version }}
+        coverage: none
+        tools: composer:v2
+
     - name: Composer install
       run: composer install
 

CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [2.1.0] - 2025-02-10
+**Note that this release bumps the WordPress minimum supported version from 6.4 to 6.5.**
+
+### Added
+- When the setting to distribute all images is turned on, do a search/replace on the distributed content to update the image URLs from the origin site to the destination site (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh), [@willemb2](https://github.com/willemb2), [@dcarrionc](https://github.com/dcarrionc), [@lucymtc](https://github.com/lucymtc), [@Sidsector9](https://github.com/Sidsector9) via [#1283](https://github.com/10up/distributor/pull/1283)).
+
+### Changed
+- The default value of the filter `dt_sync_media_delete_and_replace` has been updated from `true` to `false`. This means by default, if an existing media item is found, it is not deleted and replaced, whereas previously it was (props [@philbraun](https://github.com/philbraun), [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1296](https://github.com/10up/distributor/pull/1296)).
+- Bump WordPress "tested up to" version 6.7 (props [@jeffpaul](https://github.com/jeffpaul), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@iamdharmesh](https://github.com/iamdharmesh) via [#1290](https://github.com/10up/distributor/pull/1214)).
+- Bump WordPress minimum from 6.4 to 6.5 (props [@jeffpaul](https://github.com/jeffpaul), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@iamdharmesh](https://github.com/iamdharmesh) via [#1290](https://github.com/10up/distributor/pull/1214)).
+
+### Fixed
+- Resolved the media duplication issue when the same image is used in multiple posts (props [@philbraun](https://github.com/philbraun), [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1296](https://github.com/10up/distributor/pull/1296)).
+- Update the Show Connections AMP template to avoid a JS error (props [@s3rgiosan](https://github.com/s3rgiosan), [@dkotter](https://github.com/dkotter) via [#1293](https://github.com/10up/distributor/pull/1293)).
+
+### Developer
+- Add WordPress Playground integration (props [@dottxado](https://github.com/dottxado), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#1282](https://github.com/10up/distributor/pull/1282)).
+
 ## [2.0.6] - 2024-09-26
 ### Changed
 - Improved the management of pulled content both from the admin post list view and from the admin single post view, making it easier to see what content has been pulled and what content is linked or not linked, as well as making linking and unlinking clearer (props [@roshniahuja](https://github.com/roshniahuja), [@faisal-alvi](https://github.com/faisal-alvi), [@ravinderk](https://github.com/ravinderk), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9), [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul), [@oszkarnagy](https://github.com/oszkarnagy) via [#1036](https://github.com/10up/distributor/pull/1036)).
@@ -579,6 +597,7 @@ This adds a post type selector when viewing the Pull Content list for both exter
 - Initial closed release.
 
 [Unreleased]: https://github.com/10up/distributor/compare/trunk...develop
+[2.1.0]: https://github.com/10up/distributor/compare/2.0.6...2.1.0
 [2.0.6]: https://github.com/10up/distributor/compare/2.0.5...2.0.6
 [2.0.5]: https://github.com/10up/distributor/compare/2.0.4...2.0.5
 [2.0.4]: https://github.com/10up/distributor/compare/2.0.3...2.0.4

README.md

@@ -2,7 +2,7 @@
 
 ![Distributor](https://github.com/10up/distributor/blob/develop/assets/img/banner-1544x500.png)
 
-[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/distributor.svg)](https://github.com/10up/distributor/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v6.6%20tested-success.svg) [![License](https://img.shields.io/github/license/10up/distributor.svg)](https://github.com/10up/distributor/blob/develop/LICENSE.md) [![Dependency Review](https://github.com/10up/distributor/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/10up/distributor/actions/workflows/dependency-review.yml)
+[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/distributor.svg)](https://github.com/10up/distributor/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v6.7%20tested-success.svg) [![License](https://img.shields.io/github/license/10up/distributor.svg)](https://github.com/10up/distributor/blob/develop/LICENSE.md) [![Dependency Review](https://github.com/10up/distributor/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/10up/distributor/actions/workflows/dependency-review.yml) [![WordPress Playground Demo](https://img.shields.io/badge/Playground_Demo-8A2BE2?logo=wordpress&logoColor=FFFFFF&labelColor=3858E9&color=3858E9)](https://playground.wordpress.net/?blueprint-url=https://raw.githubusercontent.com/10up/distributor/refs/heads/develop/docs/blueprint.json)
 [![E2E Tests](https://github.com/10up/distributor/actions/workflows/cypress.yml/badge.svg)](https://github.com/10up/distributor/actions/workflows/cypress.yml) [![PHPUnit Tests](https://github.com/10up/distributor/actions/workflows/test.yml/badge.svg)](https://github.com/10up/distributor/actions/workflows/test.yml) [![Linting](https://github.com/10up/distributor/actions/workflows/lint.yml/badge.svg)](https://github.com/10up/distributor/actions/workflows/lint.yml) [![Code scanning](https://github.com/10up/distributor/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/10up/distributor/actions/workflows/codeql-analysis.yml)
 
 > Distributor is a WordPress plugin that makes it easy to distribute and reuse content across your websites — whether in a single multisite or across the web.
@@ -38,7 +38,7 @@ Distributor is built with the same extensible approach as WordPress itself, with
 ## Requirements
 
 * PHP 7.4+
-* [WordPress](http://wordpress.org) 6.4+
+* [WordPress](http://wordpress.org) 6.5+
 * External connections require HTTP Basic Authentication or [WordPress.com OAuth2](https://developer.wordpress.com/docs/oauth2/) (must be on [WordPress VIP](https://wpvip.com/)) be set up on the remote website. For Basic Auth, we recommend using [Application Passwords](https://make.wordpress.org/core/2020/11/05/application-passwords-integration-guide/#Getting-Credentials) built in to WordPress.
 * For external connections, Distributor needs to be installed on BOTH sides of the connection.
 * Version 2.0.0 of Distributor requires version 2.0.0 on BOTH sides of all connections. For other version 2.0.0 specific changes, please see our [migration guide](https://10up.github.io/distributor/tutorial-migration-guide-version-1-to-version-2.html).

composer.json

@@ -23,7 +23,7 @@
   "require-dev": {
     "10up/phpcs-composer": "dev-master",
     "10up/wp_mock": "~0.4",
-    "phpunit/phpunit": ">=7.0 <9.0",
+    "phpunit/phpunit": "^8.5",
     "yoast/phpunit-polyfills": "^1.0",
     "automattic/vipwpcs": "^2.3"
   },

distributor.php

@@ -4,8 +4,8 @@
  * Plugin URI:        https://github.com/10up/distributor
  * Update URI:        https://distributorplugin.com
  * Description:       Makes it easy to distribute and reuse content across your websites, whether inside of a multisite or across the web.
- * Version:           2.0.6
- * Requires at least: 6.4
+ * Version:           2.1.0
+ * Requires at least: 6.5
  * Requires PHP:      7.4
  * Author:            10up Inc.
  * Author URI:        https://distributorplugin.com
@@ -28,7 +28,7 @@
 	exit; // Exit if accessed directly.
 }
 
-define( 'DT_VERSION', '2.0.6' );
+define( 'DT_VERSION', '2.1.0' );
 define( 'DT_PLUGIN_FILE', preg_replace( '#^.*plugins/(.*)$#i', '$1', __FILE__ ) );
 define( 'DT_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
 define( 'DT_PLUGIN_FULL_FILE', __FILE__ );
@@ -50,7 +50,7 @@
  * @return string Minimum version required.
  */
 function minimum_wp_requirement() {
-	return '6.4';
+	return '6.5';
 }
 
 /**
@@ -88,7 +88,7 @@ function site_meets_php_requirements() {
 }
 
 /**
- * Require PHP 7.4+, WP 6.4+ - throw an error if the plugin is activated on an older version.
+ * Require PHP 7.4+, WP 6.5+ - throw an error if the plugin is activated on an older version.
  */
 register_activation_hook(
 	__FILE__,

includes/classes/DistributorPost.php

@@ -626,6 +626,11 @@ protected function get_media() {
 			$raw_media = $this->parse_media_blocks();
 		} else {
 			$raw_media = get_attached_media( get_allowed_mime_types(), $post_id );
+			// Parse images from post content.
+			$parsed_media = $this->parse_images_from_post_content();
+			foreach ( $parsed_media as $media_post ) {
+				$raw_media[ $media_post->ID ] = $media_post;
+			}
 		}
 
 		$featured_image_id = $this->get_post_thumbnail_id();
@@ -652,6 +657,49 @@ protected function get_media() {
 		return $media_array;
 	}
 
+	/**
+	 * Parse the post's content to obtain media items by image tags.
+	 *
+	 * @return array<WP_Post> Array of media posts.
+	 */
+	protected function parse_images_from_post_content() {
+		$processor = new \WP_HTML_Tag_Processor( $this->post->post_content );
+
+		$media = array();
+		while ( $processor->next_tag( 'img' ) ) {
+			$classes = explode( ' ', $processor->get_attribute( 'class' ) ?? ' ' );
+
+			if ( ! is_array( $classes ) ) {
+				continue;
+			}
+
+			// Filter out classes that are not image classes.
+			$classes = array_filter(
+				$classes,
+				function( $class ) {
+					return strpos( $class, 'wp-image-' ) === 0;
+				}
+			);
+
+			if ( empty( $classes ) ) {
+				continue;
+			}
+
+			$image_id   = (int) str_replace( 'wp-image-', '', current( $classes ) );
+			$media_post = get_post( $image_id );
+
+			if ( empty( $media_post ) ) {
+				continue;
+			}
+
+			$media[ $media_post->ID ] = $media_post;
+		}
+
+		$media = array_filter( $media );
+
+		return $media;
+	}
+
 	/**
 	 * Parse the post's content to obtain media items.
 	 *

includes/classes/InternalConnections/NetworkSiteConnection.php

@@ -180,7 +180,7 @@ public function push( $post, $args = array() ) {
 		 */
 		if ( apply_filters( 'dt_push_post_media', true, $new_post_id, $post_media, $post_id, $args, $this ) ) {
 			Utils\set_media( $new_post_id, $post_media, [ 'use_filesystem' => true ] );
-		};
+		}
 
 		$media_errors = get_transient( 'dt_media_errors_' . $new_post_id );