Merge pull request #1084 from cloudinary/fix-disable-additional-assets

Fix the feature to disable additional assets

Author: aatanasov-cloudinary

php/assets/class-rest-assets.php

@@ -258,8 +258,8 @@ public function rest_handle_state( $request ) {
 		$state = $request['state'];
 		foreach ( $ids as $id ) {
 			$where = array(
-				'post_id'    => $id,
-				'post_state' => 'asset',
+				'post_id'   => $id,
+				'sync_type' => 'asset',
 			);
 			if ( 'delete' === $state ) {
 				$data = array(

php/class-assets.php

@@ -273,9 +273,32 @@ public function can_sync( $can, $asset_id ) {
 			$can = false;
 		}
 
+		// If the asset is set to a 'disable' state, we do not allow syncing.
+		if ( $can && self::is_asset_type( $asset_id ) && $this->is_disable_state( $asset_id ) ) {
+			$can = false;
+		}
+
 		return $can;
 	}
 
+	/**
+	 * Verify if the asset is set to a 'disable' state.
+	 *
+	 * @param int $asset_id The asset ID to check.
+	 *
+	 * @return bool
+	 */
+	protected function is_disable_state( $asset_id ) {
+		global $wpdb;
+
+		$wpdb->cld_table = Utils::get_relationship_table();
+		$media_context   = Utils::get_media_context( $asset_id );
+		$prepare         = $wpdb->prepare( "SELECT `post_state` FROM $wpdb->cld_table WHERE post_id = %d AND media_context = %s;", (int) $asset_id, $media_context ); // phpcs:ignore WordPress.DB.PreparedSQL
+		$state           = $wpdb->get_var( $prepare ); // phpcs:ignore WordPress.DB
+
+		return 'disable' === $state;
+	}
+
 	/**
 	 * Check if the post is a asset post type.
 	 *

php/class-delivery.php

@@ -1069,6 +1069,11 @@ public function convert_tags( $content, $context = 'view' ) {
 			if ( empty( $relation['public_id'] || $url === $relation['public_id'] ) ) {
 				continue; // We don't need the public_id relation item.
 			}
+
+			if ( 'disable' === $relation['post_state'] ) {
+				continue; // We should not deliver disabled items.
+			}
+
 			$base           = $type . ':' . $url;
 			$public_id      = ! is_admin() ? $relation['public_id'] . '.' . $relation['format'] : null;
 			$cloudinary_url = $this->media->cloudinary_url( $relation['post_id'], array(), $relation['transformations'], $public_id );