From db6da9d4e41a9c96b495dd86b57ce9d4c84e97ae Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Thu, 27 Jul 2023 13:34:58 +0200 Subject: [PATCH] Blaze: always display menu in Calypso for Jetpack sites This is a follow-up to #31617 and #31750. We now have Blaze::enable_blaze_menu() to add the Blaze menu to wp-admin whenever necessary. However, Jetpack sites still rely on the admin-menu endpoint to display a list of custom menu items in Calypso. There, we'll want to always display the Tools > Advertising menu item, as long as the site is eligible for Blaze. --- .../changelog/fix-missing-advertising-menu-jetpack-calypso | 4 ++++ .../masterbar/admin-menu/class-jetpack-admin-menu.php | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 projects/plugins/jetpack/changelog/fix-missing-advertising-menu-jetpack-calypso diff --git a/projects/plugins/jetpack/changelog/fix-missing-advertising-menu-jetpack-calypso b/projects/plugins/jetpack/changelog/fix-missing-advertising-menu-jetpack-calypso new file mode 100644 index 0000000000000..deaf7ec1a2758 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-missing-advertising-menu-jetpack-calypso @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +Blaze: add missing Advertising menu in Calypso, for self-hosted sites. diff --git a/projects/plugins/jetpack/modules/masterbar/admin-menu/class-jetpack-admin-menu.php b/projects/plugins/jetpack/modules/masterbar/admin-menu/class-jetpack-admin-menu.php index 036c787e46d78..9f054bf1672d6 100644 --- a/projects/plugins/jetpack/modules/masterbar/admin-menu/class-jetpack-admin-menu.php +++ b/projects/plugins/jetpack/modules/masterbar/admin-menu/class-jetpack-admin-menu.php @@ -7,6 +7,7 @@ namespace Automattic\Jetpack\Dashboard_Customizations; +use Automattic\Jetpack\Blaze; use Automattic\Jetpack\Current_Plan as Jetpack_Plan; require_once __DIR__ . '/class-admin-menu.php'; @@ -242,6 +243,11 @@ public function add_tools_menu() { add_menu_page( esc_attr__( 'Tools', 'jetpack' ), __( 'Tools', 'jetpack' ), 'publish_posts', 'tools.php', null, 'dashicons-admin-tools', 75 ); add_submenu_page( 'tools.php', esc_attr__( 'Marketing', 'jetpack' ), __( 'Marketing', 'jetpack' ), 'publish_posts', 'https://wordpress.com/marketing/tools/' . $this->domain ); + + if ( Blaze::should_initialize() ) { + add_submenu_page( 'tools.php', esc_attr__( 'Advertising', 'jetpack' ), __( 'Advertising', 'jetpack' ), 'manage_options', 'https://wordpress.com/advertising/' . $this->domain, null, 1 ); + } + add_submenu_page( 'tools.php', esc_attr__( 'Earn', 'jetpack' ), __( 'Earn', 'jetpack' ), 'manage_options', 'https://wordpress.com/earn/' . $this->domain ); // Import/Export on Jetpack sites is always handled on WP Admin.