Monetize: Move menu item under the Jetpack menu for all Classic inter…

…face users (#36995) * Monetize: Move to Jetpack menu to all Classic interface users * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/8779097046 Upstream-Ref: Automattic/jetpack@222c807
Automattic · Apr 22, 2024 · 5ffedc7 · 5ffedc7
1 parent ae5cbc8
commit 5ffedc7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md
@@ -14,6 +14,7 @@ This is an alpha version! The changes listed here are not final.
 
 ### Changed
 - Launch the WP.com themes banner in wp-admin to all users
+- Monetize: Move menu item under Jetpack menu for all Classic interface users
 
 ### Fixed
 - Added completed callback for site_launched task

diff --git a/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php b/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
@@ -11,6 +11,7 @@
 use Automattic\Jetpack\Jetpack_Mu_Wpcom;
 use Automattic\Jetpack\Redirect;
 use Automattic\Jetpack\Status;
+use Automattic\Jetpack\Status\Host;
 
 /**
  * Check if the current user has a WordPress.com account connected.
@@ -217,7 +218,11 @@ function add_all_sites_menu_to_masterbar( $wp_admin_bar ) {
  * Add the WordPress.com submenu items related to Jetpack under the Jetpack menu on the wp-admin sidebar.
  */
 function wpcom_add_jetpack_menu_item() {
-	if ( ! function_exists( 'wpcom_is_nav_redesign_enabled' ) || ! wpcom_is_nav_redesign_enabled() ) {
+	/*
+	 * Do not display any menu on WoA and WordPress.com Simple sites (unless Classic wp-admin is enabled).
+	 * They already get a menu item under Users via nav-unification.
+	 */
+	if ( ( new Host() )->is_wpcom_platform() && get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
 		return;
 	}
 

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "e8b2ca6e169ec81d7f66ce685998c39490d4e53a"
+                "reference": "7c4da9eee0e5776b3eaa6e4acec84d572f78180c"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.1",
@@ -76,7 +76,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "1e3a98f4253ca6ab7ff2ab9be4c3bbe3184ecbbd"
+                "reference": "bc84a70672fa912e1f37c3a6765d12f681755e02"
             },
             "require": {
                 "php": ">=7.0"
@@ -125,12 +125,12 @@
         },
         {
             "name": "automattic/jetpack-mu-wpcom",
-            "version": "5.25.0-alpha.1713537726",
-            "version_normalized": "5.25.0.0-alpha1713537726",
+            "version": "5.25.0-alpha.1713764474",
+            "version_normalized": "5.25.0.0-alpha1713764474",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
-                "reference": "7aee7c51c7b1e3eacf33d24e4f6f39697dcb9f23"
+                "reference": "aa37baaddb4a93b5b97c4b189040c75693ad7592"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.8-alpha",
@@ -203,7 +203,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "5136a80e2e8999c1c1e06ea5e68659369ee34387"
+                "reference": "a90beb83e7252096011069bd10a0b81fc9b11063"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.1",
@@ -259,7 +259,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/scheduled-updates",
-                "reference": "e1dc18c3d7b44886ea73501208f95095e2dc5b28"
+                "reference": "e664ead65cb92db387f9cabee85138d4d7a07ca3"
             },
             "require": {
                 "php": ">=7.0"

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -13,7 +13,7 @@
         'automattic/jetpack-assets' => array(
             'pretty_version' => '2.1.8-alpha.1713286100',
             'version' => '2.1.8.0-alpha1713286100',
-            'reference' => 'e8b2ca6e169ec81d7f66ce685998c39490d4e53a',
+            'reference' => '7c4da9eee0e5776b3eaa6e4acec84d572f78180c',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../automattic/jetpack-assets',
             'aliases' => array(),
@@ -22,16 +22,16 @@
         'automattic/jetpack-constants' => array(
             'pretty_version' => '2.0.1',
             'version' => '2.0.1.0',
-            'reference' => '1e3a98f4253ca6ab7ff2ab9be4c3bbe3184ecbbd',
+            'reference' => 'bc84a70672fa912e1f37c3a6765d12f681755e02',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../automattic/jetpack-constants',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'automattic/jetpack-mu-wpcom' => array(
-            'pretty_version' => '5.25.0-alpha.1713537726',
-            'version' => '5.25.0.0-alpha1713537726',
-            'reference' => '7aee7c51c7b1e3eacf33d24e4f6f39697dcb9f23',
+            'pretty_version' => '5.25.0-alpha.1713764474',
+            'version' => '5.25.0.0-alpha1713764474',
+            'reference' => 'aa37baaddb4a93b5b97c4b189040c75693ad7592',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom',
             'aliases' => array(),
@@ -49,7 +49,7 @@
         'automattic/jetpack-status' => array(
             'pretty_version' => '2.2.2-alpha.1713536770',
             'version' => '2.2.2.0-alpha1713536770',
-            'reference' => '5136a80e2e8999c1c1e06ea5e68659369ee34387',
+            'reference' => 'a90beb83e7252096011069bd10a0b81fc9b11063',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../automattic/jetpack-status',
             'aliases' => array(),
@@ -58,7 +58,7 @@
         'automattic/scheduled-updates' => array(
             'pretty_version' => '0.8.0-alpha.1713536770',
             'version' => '0.8.0.0-alpha1713536770',
-            'reference' => 'e1dc18c3d7b44886ea73501208f95095e2dc5b28',
+            'reference' => 'e664ead65cb92db387f9cabee85138d4d7a07ca3',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../automattic/scheduled-updates',
             'aliases' => array(),