Skip to content

fix: keep new uploads local while an Image Storage rollback runs #1174

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
pirate-bot merged 3 commits into from
Oct 12, 2026
Merged

fix: keep new uploads local while an Image Storage rollback runs #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1714a7e
fix: keep new uploads local while an Image Storage rollback runs
selul Oct 9, 2026
bfa5ef9
test: add a void return type to the rollback upload test
selul Oct 11, 2026
aed9286
test: move the rollback upload test away from the other new media tests
selul Oct 11, 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
23 changes: 16 additions & 7 deletions inc/media_offload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,14 @@ public static function instance() {
self::$instance->init();
}
if ( self::$instance->settings->is_offload_enabled() ) {
// While a rollback runs, offloaded images are still served from Optimole, but new uploads
// stay local: offloading them and their filename deduplication needs offload_media on.
$offload_new_uploads = self::$instance->settings->get( 'offload_media' ) === 'enabled';

add_filter( 'image_downsize', [ self::$instance, 'generate_filter_downsize_urls' ], 10, 3 );
add_filter( 'wp_generate_attachment_metadata', [ self::$instance, 'generate_image_meta' ], 10, 2 );
if ( $offload_new_uploads ) {
add_filter( 'wp_generate_attachment_metadata', [ self::$instance, 'generate_image_meta' ], 10, 2 );
}
add_filter( 'wp_get_attachment_url', [ self::$instance, 'get_image_attachment_url' ], - 999, 2 );
add_filter( 'wp_insert_post_data', [ self::$instance, 'filter_uploaded_images' ] );

Expand All @@ -176,12 +182,15 @@ public static function instance() {
add_filter( 'wp_calculate_image_srcset', [ self::$instance, 'calculate_image_srcset' ], 1, 5 );
add_action( 'post_updated', [ self::$instance, 'update_offload_meta' ], 10, 3 );

// Backwards compatibility for older versions of WordPress < 6.0.0 requiring 3 parameters for this specific filter.
$below_6_0_0 = version_compare( get_bloginfo( 'version' ), '6.0.0', '<' );
if ( $below_6_0_0 ) {
add_filter( 'wp_insert_attachment_data', [ self::$instance, 'insert_legacy' ], 10, 3 );
} else {
add_filter( 'wp_insert_attachment_data', [ self::$instance, 'insert' ], 10, 4 );
// Local uploads keep WordPress's own filename deduplication.
if ( $offload_new_uploads ) {
// Backwards compatibility for older versions of WordPress < 6.0.0 requiring 3 parameters for this specific filter.
$below_6_0_0 = version_compare( get_bloginfo( 'version' ), '6.0.0', '<' );
if ( $below_6_0_0 ) {
add_filter( 'wp_insert_attachment_data', [ self::$instance, 'insert_legacy' ], 10, 3 );
} else {
add_filter( 'wp_insert_attachment_data', [ self::$instance, 'insert' ], 10, 4 );
}
}

add_action( 'optml_start_processing_images', [ self::$instance, 'start_processing_images' ], 10, 6 );
Expand Down
25 changes: 25 additions & 0 deletions tests/test-media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,31 @@ static function unlinkRecursive( $pattern, $files ) {
}
}
}
/**
* While a rollback runs (offload_media off, rollback_status on), offloaded images are still
* served from Optimole, but a new upload stays in the media library.
*/
public function test_upload_during_rollback_stays_local(): void {
$settings = new Optml_Settings();
$settings->update( 'offload_media', 'disabled' );
$settings->update( 'rollback_status', 'enabled' );

// The hooks of this request, registered with the rollback state.
remove_all_filters( 'wp_generate_attachment_metadata' );
remove_all_filters( 'wp_insert_attachment_data' );
Optml_Media_Offload::instance();

$this->assertFalse( has_filter( 'wp_generate_attachment_metadata' ) );
$this->assertFalse( has_filter( 'wp_insert_attachment_data' ) );
$this->assertNotFalse( has_filter( 'wp_get_attachment_url' ), 'Offloaded images are still served from Optimole.' );

$attachment_id = self::factory()->attachment->create_upload_object( OPTML_PATH . 'tests/assets/' . self::$files[0] . '.jpg' );
$meta = wp_get_attachment_metadata( $attachment_id );

$this->assertFalse( Optml_Media_Offload::is_uploaded_image( $meta['file'] ) );
$this->assertFileExists( get_attached_file( $attachment_id ) );
}

public function test_retryable_error() {
Optml_Media_Offload::instance()->rollback_and_update_images([self::$sample_attachement]);
self::$error_mark = true;
Expand Down
Loading