fix(admin-ui): apply page hooks to the admin_page_ fallback prefix by LiamSarsfield · Pull Request #52622 · Automattic/jetpack

LiamSarsfield · 2026-09-22T12:39:19Z

Proposed changes

Admin_Menu::add_menu() now registers each page's hooks under both jetpack_page_<slug> and admin_page_<slug>. WordPress uses the admin_page_ name when a user can open the page but has no Jetpack top-level menu, for example an editor on a site that is not connected yet while the Jetpack plugin is active. The core-notice hiding and the design-tokens stylesheet now load on that page too. The return value of add_menu() is unchanged.
The My Jetpack load hook is handled separately in fix(my-jetpack): fix page loading for editors on unconnected sites #52614; this change covers Admin_Menu's own hooks.
Adds one PHPUnit test for the admin_page_ hook.

Bundles that change (every plugin that includes admin-ui): agents-manager, automattic-for-agencies-client, backup, beta, boost, classic-theme-helper-plugin, inspect, jetpack, mu-wpcom-plugin, paypal-payment-buttons, premium-analytics, protect, search, social, starter-plugin, stats, videopress, wpcloud-sso, wpcomsh.

Does this pull request change what data or activity we track or use?

No.

Testing instructions

Activate the Jetpack plugin on a site that is not connected and not in offline mode.
As an editor, open wp-admin/admin.php?page=my-jetpack. The body class is admin_page_my-jetpack. Before this change, neither jetpack-admin-ui-design-tokens-css nor jetpack-admin-ui-hide-core-notices-inline-css is in the page; after it, both are.
As an administrator, open the same page. It uses jetpack_page_my-jetpack and has both styles before and after; screenshots are byte-identical.

When the user has no Jetpack top-level menu, WordPress registers an Admin_Menu page as admin_page_<slug>, so the core-notice hiding and the design-tokens stylesheet, both keyed on jetpack_page_<slug>, never ran. Register both prefixes.

…fallback

github-actions · 2026-09-22T12:40:29Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack or WordPress.com Site Helper), and enable the fm/admin-ui-fallback-page-hooks branch.
To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack fm/admin-ui-fallback-page-hooks

bin/jetpack-downloader test jetpack-mu-wpcom-plugin fm/admin-ui-fallback-page-hooks

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

github-actions · 2026-09-22T12:40:51Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Review, ...).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
You can use GitHub's Reviewers functionality to request a review.
When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen as soon as you deploy your changes after merging this PR (PCYsg-Jjm-p2).
WoA releases happen weekly.
Releases to self-hosted sites happen monthly:
- Scheduled release: October 6, 2026

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

jp-launch-control · 2026-09-22T12:54:58Z

Code Coverage Summary

Coverage changed in 1 file.

File	Coverage	Δ%	Δ Uncovered
projects/packages/admin-ui/src/class-admin-menu.php	246/276 (89.13%)	0.40%	-1 💚

Full summary · PHP report · JS report

Mention offline mode in the Jetpack changelog entry too.

xavier-lc

The fix looks right to me: admin_page_ is only used when the Jetpack plugin skips its top-level menu for a non-admin, which covers both the disconnected and offline cases, so adding the changelog entry to the Jetpack plugin alone is correct. I have two small test cleanups inline and nothing blocking.

xavier-lc · 2026-09-28T08:24:39Z

+		// test_page_suffix_matches leaves a `jetpack` entry behind, which would give core's jetpack_page_ name.
+		global $admin_page_hooks;
+		unset( $admin_page_hooks['jetpack'] );


This depends on which tests ran first. setUp() already resets $menu, $submenu, $_parent_pages and $_registered_pages. Adding $admin_page_hooks = array(); there would let you drop this unset and the comment that names another test.

Good call, I moved the $admin_page_hooks reset into setUp() and dropped the unset and its comment. Once the hooks reset for every test, test_page_suffix_matches also needed the menu registered per data set, so that's in 5e489d3 too.

xavier-lc · 2026-09-28T08:24:39Z

+		wp_set_current_user(
+			wp_insert_user(
+				array(
+					'user_login' => 'fallback_editor',
+					'user_pass'  => 'pass',
+					'role'       => 'editor',
+				)
+			)
+		);
+


This user is never deleted. wp_set_current_user( self::$editor_user_id ); reuses the class's editor, the same way the neighbouring tests do.

Done, it now uses self::$editor_user_id like the neighbouring tests.

xavier-lc

Thanks, both addressed. LGTM.

LiamSarsfield added 2 commits September 22, 2026 13:27

no-mistakes(document): Correct add_menu hook comment for admin_page_ …

0304bf7

…fallback

github-actions Bot added [Package] Admin Ui [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Tests] Includes Tests labels Sep 22, 2026

github-actions Bot added the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label Sep 22, 2026

xavier-lc mentioned this pull request Sep 22, 2026

fix(my-jetpack): fix page loading for editors on unconnected sites #52614

Merged

LiamSarsfield marked this pull request as draft September 22, 2026 15:08

github-actions Bot added the [Status] In Progress label Sep 22, 2026

Admin UI: take the admin_page_ fallback hook name from core in the test

694fdbe

Mention offline mode in the Jetpack changelog entry too.

LiamSarsfield marked this pull request as ready for review September 22, 2026 15:58

LiamSarsfield removed the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label Sep 22, 2026

LiamSarsfield requested review from a team and xavier-lc September 22, 2026 15:58

LiamSarsfield added a commit that referenced this pull request Sep 22, 2026

Merge #52622 for refreshed walkthrough

3c9da48

LiamSarsfield mentioned this pull request Sep 22, 2026

Boost: walkthrough integration build (do not merge) #52559

Closed

LiamSarsfield added a commit that referenced this pull request Sep 22, 2026

Merge #52622 for refreshed walkthrough

1cbd9d8

xavier-lc reviewed Sep 28, 2026

View reviewed changes

LiamSarsfield added 2 commits September 30, 2026 10:53

Admin UI: reset page hooks and reuse the editor in menu tests

5e489d3

Admin UI: isolate bundled design tokens in the fallback hook test

faeb622

LiamSarsfield requested a review from xavier-lc September 30, 2026 11:02

xavier-lc approved these changes Sep 30, 2026

View reviewed changes

LiamSarsfield merged commit ffee571 into trunk Oct 1, 2026
124 checks passed

LiamSarsfield deleted the fm/admin-ui-fallback-page-hooks branch October 1, 2026 08:23

github-actions Bot removed the [Status] In Progress label Oct 1, 2026

github-actions Bot added this to the jetpack/16.3 milestone Oct 1, 2026

Navigation Menu

Repository navigation

fix(admin-ui): apply page hooks to the admin_page_ fallback prefix - #52622

fix(admin-ui): apply page hooks to the admin_page_ fallback prefix#52622
LiamSarsfield merged 5 commits into
trunkfrom
fm/admin-ui-fallback-page-hooks

LiamSarsfield commented Sep 22, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Sep 22, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Sep 22, 2026 •

edited

Loading

Uh oh!

jp-launch-control Bot commented Sep 22, 2026 •

edited

Loading

Uh oh!

xavier-lc left a comment

Uh oh!

xavier-lc Sep 28, 2026

Uh oh!

LiamSarsfield Sep 30, 2026

Uh oh!

xavier-lc Sep 28, 2026

Uh oh!

LiamSarsfield Sep 30, 2026

Uh oh!

xavier-lc left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

LiamSarsfield commented Sep 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes

Does this pull request change what data or activity we track or use?

Testing instructions

Uh oh!

github-actions Bot commented Sep 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Sep 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jp-launch-control Bot commented Sep 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage Summary

Uh oh!

xavier-lc left a comment

Choose a reason for hiding this comment

Uh oh!

xavier-lc Sep 28, 2026

Choose a reason for hiding this comment

Uh oh!

LiamSarsfield Sep 30, 2026

Choose a reason for hiding this comment

Uh oh!

xavier-lc Sep 28, 2026

Choose a reason for hiding this comment

Uh oh!

LiamSarsfield Sep 30, 2026

Choose a reason for hiding this comment

Uh oh!

xavier-lc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

LiamSarsfield commented Sep 22, 2026 •

edited

Loading

github-actions Bot commented Sep 22, 2026 •

edited

Loading

github-actions Bot commented Sep 22, 2026 •

edited

Loading

jp-launch-control Bot commented Sep 22, 2026 •

edited

Loading