Skip to content

Fix deletion of wrong assets in multisite setup #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabrielcld2 merged 3 commits into from
Apr 24, 2026
+26 −2
Merged

Fix deletion of wrong assets in multisite setup #1162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5082fdb
Verify blog id on multisite before asset parent deletion
gabriel-detassigny Feb 13, 2026
25a1be1
Rename method
gabriel-detassigny Feb 16, 2026
1b262a1
Merge branch 'develop' into feature/parent-multisite-check
gabriel-detassigny Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions php/class-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,20 @@ protected function activate_parents() {
}
}
}

$blog_id = get_current_blog_id();

// Get the disabled items.
foreach ( $this->asset_parents as $url => $parent ) {
if ( isset( $this->active_parents[ $url ] ) ) {
continue;
}

// If the parent is from another site on a multisite instance, skip it.
if ( isset( $parent->blog_id ) && $parent->blog_id !== $blog_id ) {
continue;
}

if ( ! $this->is_post_cloudinary_asset( $parent->ID ) ) {
continue;
}
Expand Down Expand Up @@ -575,7 +583,8 @@ public function create_asset_parent( $path, $version ) {
if ( $parent_id ) {
$this->media->update_post_meta( $parent_id, Sync::META_KEYS['version'], $version );
$this->media->update_post_meta( $parent_id, self::META_KEYS['excludes'], array() );
$this->asset_parents[ $path ] = get_post( $parent_id );

$this->add_asset_parent( get_post( $parent_id ) );
}

return $parent_id;
Expand Down Expand Up @@ -984,7 +993,7 @@ protected function init_asset_parents() {

do {
foreach ( $query->get_posts() as $post ) {
$this->asset_parents[ $post->post_title ] = $post;
$this->add_asset_parent( $post );
}
$args = $query->query_vars;
++$args['paged'];
Expand Down Expand Up @@ -1773,4 +1782,19 @@ protected function add_external_settings() {

return $params;
}

/**
* Assign a parent asset to the asset parents array.
* If this is a multisite installation, also assign the current blog ID to the post object for later checks.
*
* @param \WP_Post $post The post to assign.
* @return void
*/
protected function add_asset_parent( $post ) {
if ( is_multisite() ) {
$post->blog_id = get_current_blog_id();
Copy link
Copy Markdown
Contributor

@PatelUtkarsh PatelUtkarsh Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 thought: Stamping blog_id as a dynamic property on WP_Post only works because WP core annotated WP_Post with #[AllowDynamicProperties] (WP 6.4+). On sites running PHP 8.2+ with older WordPress, this triggers deprecation warnings. Which is odd combo anyway.

Copy link
Copy Markdown
Collaborator Author

@gabrielcld2 gabrielcld2 Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! It's probably fine if it's just a deprecation warning given the odd combination of WP & PHP version like you said, it's quite unlikely to happen.

}

$this->asset_parents[ $post->post_title ] = $post;
}
}
Loading