Launch Site-Level User Profile project (#39181)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10678567926 Upstream-Ref: Automattic/jetpack@273f45d
Automattic · Sep 3, 2024 · ce12bf2 · ce12bf2
1 parent 184027d
commit ce12bf2
Show file tree

Hide file tree

Showing 13 changed files with 129 additions and 155 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
 	"type": "wordpress-plugin",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-mu-wpcom": "^5.61.0"
+		"automattic/jetpack-mu-wpcom": "^5.62.0-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-masterbar/CHANGELOG.md b/vendor/automattic/jetpack-masterbar/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).
 
+## [0.9.0-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Changed
+- Enable Users -> Profile (profile.php) on all sites
+
 ## [0.8.1] - 2024-08-30
 ### Changed
 - Updated package dependencies. [#39111]
@@ -106,6 +113,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies. [#37669]
 - Updated package dependencies. [#37706]
 
+[0.9.0-alpha]: https://github.com/Automattic/jetpack-masterbar/compare/v0.8.1...v0.9.0-alpha
 [0.8.1]: https://github.com/Automattic/jetpack-masterbar/compare/v0.8.0...v0.8.1
 [0.8.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.6.1...v0.7.0

diff --git a/vendor/automattic/jetpack-masterbar/composer.json b/vendor/automattic/jetpack-masterbar/composer.json
@@ -54,7 +54,7 @@
 	"extra": {
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "0.8.x-dev"
+			"dev-trunk": "0.9.x-dev"
 		},
 		"changelogger": {
 			"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"

diff --git a/vendor/automattic/jetpack-masterbar/src/admin-menu/class-atomic-admin-menu.php b/vendor/automattic/jetpack-masterbar/src/admin-menu/class-atomic-admin-menu.php
@@ -136,12 +136,6 @@ public function add_users_menu() {
 			// The 'Subscribers' menu exists in the Jetpack menu for Classic wp-admin interface, so only add it for non-wp-admin interfaces.
 			// // @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
 			add_submenu_page( 'users.php', esc_attr__( 'Subscribers', 'jetpack-masterbar' ), __( 'Subscribers', 'jetpack-masterbar' ), 'list_users', 'https://wordpress.com/subscribers/' . $this->domain, null );
-
-			if ( empty( get_option( 'wpcom_site_level_user_profile' ) ) ) {
-				remove_submenu_page( 'users.php', 'profile.php' );
-				// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-				add_submenu_page( 'users.php', esc_attr__( 'My Profile', 'jetpack-masterbar' ), __( 'My Profile', 'jetpack-masterbar' ), 'read', 'https://wordpress.com/me/', null );
-			}
 		}
 
 		// Users who can't 'list_users' will see "Profile" menu & "Profile > Account Settings" as submenu.

diff --git a/vendor/automattic/jetpack-masterbar/src/class-main.php b/vendor/automattic/jetpack-masterbar/src/class-main.php
@@ -14,7 +14,7 @@
  */
 class Main {
 
-	const PACKAGE_VERSION = '0.8.1';
+	const PACKAGE_VERSION = '0.9.0-alpha';
 
 	/**
 	 * Initializer.

diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/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.62.0-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Changed
+- Enable Users -> Profile (profile.php) on all sites
+
 ## [5.61.0] - 2024-09-02
 ### Changed
 - MU WPCOM: Disable the Open Graph Tags according to the privacy of the site [#39012]
@@ -1205,6 +1212,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[5.62.0-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.61.0...v5.62.0-alpha
 [5.61.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.60.0...v5.61.0
 [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

diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json
@@ -10,7 +10,7 @@
 		"automattic/jetpack-calypsoify": "^0.1.5",
 		"automattic/jetpack-classic-theme-helper": "^0.5.4",
 		"automattic/jetpack-connection": "^2.13.0-alpha",
-		"automattic/jetpack-masterbar": "^0.8.1",
+		"automattic/jetpack-masterbar": "^0.9.0-alpha",
 		"automattic/jetpack-redirect": "^2.0.3",
 		"automattic/jetpack-stats-admin": "^0.21.1",
 		"automattic/jetpack-status": "^3.3.4",
@@ -53,7 +53,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "5.61.x-dev"
+			"dev-trunk": "5.62.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

diff --git a/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/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.61.0';
+	const PACKAGE_VERSION = '5.62.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;