Skip to content

Commit

Permalink
admin-ui: Register Akismet menu for Jetpack-the-plugin too (#33559)
Browse files Browse the repository at this point in the history
* admin-ui: Register Akismet menu for Jetpack-the-plugin too

In #32911, we changed Jetpack to try to start using Admin_Menu to
register a menu for Akismet instead of doing it itself, to avoid a bug
where we'd get duplicate menu entries if a standalone plugin initialized
Admin_Menu before Jetpack got loaded.

Unfortunately it wasn't noticed that Admin_Menu specifically avoids
registering a menu for Akismet if Jetpack is present, so now Akismet
isn't being registered at all.

Fix that by removing that check, allowing Admin_Menu to register Akismet
for Jetpack too.

* Revert "Revert "Utilize the Admin UI package for handling the Akismet menu" (#33551)"

This reverts commit 6828e4b8b2500425839ea8b61c8f725dcf18a5cb.

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6667812010
  • Loading branch information
anomiex authored and matticbot committed Oct 27, 2023
1 parent 840a6a2 commit 699b543
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
"automattic/jetpack-admin-ui": "^0.2.23",
"automattic/jetpack-admin-ui": "^0.2.24-alpha",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-roles": "^1.4.25",
"automattic/jetpack-status": "^1.18.5",
Expand Down

0 comments on commit 699b543

Please sign in to comment.