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

[selul]

Related issue: #1159

While an Image Storage rollback ran, new uploads were still offloaded to Optimole. During a rollback offload_media is off, but is_offload_enabled() stays true so that already offloaded images keep being served from Optimole, and that also kept the upload hooks on. New uploads now stay in the media library while a rollback runs.

What changed

• Optml_Media_Offload::instance() — two hooks are registered only while offload_media is on, not during a rollback:
  • wp_generate_attachment_metadata → generate_image_meta(), which offloads a new upload;
  • wp_insert_attachment_data → insert() / insert_legacy(), the filename deduplication offloaded uploads need because their local files are deleted. It renames the attached file, and only generate_image_meta() maps that name back, so the two must be gated together.

Note

Everything that serves offloaded images (URL, srcset, attachment and editor filters) stays registered during the rollback, as before. Bulk offload, single-image moves and the Abilities API call generate_image_meta() through upload_and_update_existing_images(), not the hook, so they are unaffected.

One narrow side effect to know: an upload made during a rollback keeps its local file. If a not-yet-restored offloaded image with the same file name in the same uploads/Y/m folder is restored later in that rollback, WordPress gives the restored file a -1 suffix (the #1136 area).

Tests

• tests/test-media.php: with offload_media off and a rollback in progress, instance() registers neither hook (but still serves offloaded URLs), and a new upload keeps a local file in its metadata and on disk. The test fails on development.

QA

1. On a connected site with offloaded images, start Transfer back from Optimole in WP Admin → Optimole → Settings → Image Storage.

2. While it runs, upload a new image in Media → Add New.

   Expect: the new image's URL points to wp-content/uploads/…, and the file exists on the server.

3. With Image Storage on and no transfer running, upload another image.

   Expect: it is offloaded as before.

Verification (head aed92868)

Check	Result
PHPUnit, full suite, PHP 8.4 (WP 7.1.3)	PASS: 365 tests (baseline 364 + 1 new)
tests/test-media.php run alone	PASS: 24 tests
New test on the development source	FAILS
phpcs, phpstan (build-only include errors excluded locally; CI builds assets first)	PASS
CI on aed92868 (PHPUnit on PHP 8.0–8.3, PHPStan, phpcs, ESLint, Jest, e2e, build)	PASS
Codex review (gpt-6-astra, high), 1714a7e0 and the follow-up on aed92868	No findings
pirate-bot	Round 1 (1714a7e0): changes requested, a void return type on the new test (fixed; the test was also moved away from where two other open PRs add theirs). Round 2 (aed92868): approved

Not proven

• On a live site: the local test site is not connected to Optimole, so uploads cannot be offloaded there.

🤖 Generated with Claude Code

[pirate-bot]

Plugin build for aed9286 is ready 🛎️!

• Download build
• Download dev

[pirate-bot]

🟡 Changes requested

The rollback gate works, and the new test detects it. Add the missing void return type to the new test method.

Validation details

• Files reviewed: 2/2 changed files.
• sandbox-phpunit-ab.sh /repo pr-base --filter 'Test_Media::' ran on PHP 8.3.35 with the WP 7.1.3 test library. HEAD printed OK (24 tests, 134 assertions). The base tree failed test_upload_during_rollback_stays_local at tests/test-media.php:362. No run record was emitted for this command.
• A source read shows that rollback selects only offloaded attachments. A new local upload is not restored.
• A restored file goes through wp_handle_sideload() and wp_unique_filename(). It gets a -N suffix and does not overwrite the new upload.
• The hooks that stay registered return their input for attachments that were not offloaded.
• The security pass found no changed trust boundary.

Untested areas

• An upload during a rollback on a site connected to Optimole was not run. The sandbox is not connected.
• The insert_legacy path for WordPress before 6.0 was not executed.

🤖 Automated review · run code-review-agent_6acb86a43daef7.46072993.

---

🤖 Review agent — review posted ✅ on 1714a7e0 · changes requested · 1 finding · 26 min

Run code-review-agent_6acb86a43daef7.46072993 · trail

[pirate-bot]

🟢 Approved

The PR passes. The earlier void return type finding is fixed, and the moved test still detects the rollback gate.

Validation details

• Files reviewed: 2/2 changed files.
• The only new commit moves the rollback test and adds : void.
• sandbox-phpunit-ab.sh /repo pr-base --filter 'Test_Media::' ran on PHP 8.3.35 at a clean aed92868 checkout. HEAD printed OK (24 tests, 134 assertions). The base tree failed test_upload_during_rollback_stays_local. No run record was emitted.
• The new test order breaks no other Test_Media test.
• The checks of inc/media_offload.php and the security pass come from run code-review-agent_6acb86a43daef7.46072993, not rerun. That file did not change since then.

Untested areas

• An upload during a rollback on a connected Optimole site was not run. The sandbox is not connected.
• The insert_legacy path for WordPress before 6.0 was not executed.

🤖 Automated review · run code-review-agent_6acb9630246ff4.31874945.

---

🤖 Review agent — review posted ✅ on aed92868 · approved · 0 findings · 7 min

Run code-review-agent_6acb9630246ff4.31874945 · trail