Point "Edit Profile" to /me when the user is not a member of the site…

… (#39091)

* Point "Edit Profile" to profile.php when Site-Level Profile is enabled

* changelog

* chore: Update package versions to 5.60.0-alpha

* Point Howdy to /me

* chore: Update package versions for jetpack-mu-wpcom and mu-wpcom-plugin

* feat: Update composer.lock for mu-wpcom-plugin and wpcomsh plugins

* Add comment

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10659197682

Upstream-Ref: Automattic/jetpack@39fa952

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.5.11-alpha - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## 2.5.10 - 2024-08-30
 ### Changed
 - Internal updates.

composer.json

@@ -4,7 +4,7 @@
 	"type": "wordpress-plugin",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-mu-wpcom": "^5.60.0"
+		"automattic/jetpack-mu-wpcom": "^5.61.0-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
@@ -37,6 +37,6 @@
 		]
 	},
 	"config": {
-		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_10"
+		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_11_alpha"
 	}
 }

mu-wpcom-plugin.php

@@ -3,7 +3,7 @@
  *
  * Plugin Name: WordPress.com Features
  * Description: Test plugin for the jetpack-mu-wpcom package
- * Version: 2.5.10
+ * Version: 2.5.11-alpha
  * Author: Automattic
  * License: GPLv2 or later
  * Text Domain: jetpack-mu-wpcom-plugin

package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom-plugin",
-	"version": "2.5.10",
+	"version": "2.5.11-alpha",
 	"description": "Test plugin for the jetpack-mu-wpcom package",
 	"homepage": "https://jetpack.com",
 	"bugs": {

vendor/autoload.php

@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_10::getLoader();
+return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_11_alpha::getLoader();

vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.61.0-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Changed
+- Point "Edit Profile" to profile.php when Site-Level Profile is enabled
+
 ## [5.60.0] - 2024-08-30
 ### Added
 - Add Meta crawler. [#39159]
@@ -1200,6 +1207,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[5.61.0-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.60.0...v5.61.0-alpha
 [5.60.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.59.0...v5.60.0
 [5.59.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.58.0...v5.59.0
 [5.58.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.57.1...v5.58.0

vendor/automattic/jetpack-mu-wpcom/composer.json

@@ -53,7 +53,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "5.60.x-dev"
+			"dev-trunk": "5.61.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php

@@ -15,7 +15,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.60.0';
+	const PACKAGE_VERSION = '5.61.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;

vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-admin-bar/class-wpcom-admin-bar.php

@@ -59,18 +59,6 @@ public function add_node( $args ) {
 			parent::add_node( $args );
 			return;
 		}
-
-		if ( $args['id'] === 'my-account' ) {
-			if ( ! is_user_member_of_blog() || get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
-				$args['href'] = 'https://wordpress.com/me';
-
-				// Temporarily point to wpcalypso.wordpress.com for testing purposes.
-				if ( get_option( 'wpcom_site_level_user_profile' ) === '1' ) {
-					$args['href'] = 'https://wpcalypso.wordpress.com/me';
-				}
-			}
-		}
-
 		$home_url  = home_url( '/' );
 		$site_slug = wp_parse_url( $home_url, PHP_URL_HOST );
 		$href      = str_replace( $home_url, '', $args['href'] );