Masterbar - Add query param to URL only for users who can access wp-a…

…dmin (#38493) * Add query param to URL only for users with manage options permission * changelog * Bump version * Add query param to URL only for users who can access wp-admin
Automattic · Jul 24, 2024 · 2e29add · 2e29add
1 parent e12d29a
commit 2e29add
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 11 deletions.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-do-not-add-originsiteid b/projects/packages/jetpack-mu-wpcom/changelog/update-do-not-add-originsiteid
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Add query param to URL only for users with manage options permission
diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json
@@ -62,7 +62,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "5.48.x-dev"
+			"dev-trunk": "5.49.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.48.0",
+	"version": "5.49.0-alpha",
 	"description": "Enhances your site with features powered by WordPress.com",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
 	"bugs": {

diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -13,7 +13,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.48.0';
+	const PACKAGE_VERSION = '5.49.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php
@@ -24,6 +24,11 @@ function maybe_add_origin_site_id_to_url( $url ) {
 		return $url;
 	}
 
+	// Add query param to URL only for users who can access wp-admin.
+	if ( ! current_user_can( 'read' ) ) {
+		return $url;
+	}
+
 	return add_query_arg( 'origin_site_id', $site_id, $url );
 }
 

diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-do-not-add-originsiteid b/projects/plugins/mu-wpcom-plugin/changelog/update-do-not-add-originsiteid
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
diff --git a/projects/plugins/wpcomsh/changelog/update-do-not-add-originsiteid b/projects/plugins/wpcomsh/changelog/update-do-not-add-originsiteid
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json
@@ -129,7 +129,7 @@
 			"composer/installers": true,
 			"roots/wordpress-core-installer": true
 		},
-		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_0_0"
+		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_0_1_alpha"
 	},
 	"extra": {
 		"mirror-repo": "Automattic/wpcom-site-helper",

diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock
diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json
@@ -3,7 +3,7 @@
 	"name": "@automattic/jetpack-wpcomsh",
 	"description": "A helper for connecting WordPress.com sites to external host infrastructure.",
 	"homepage": "https://jetpack.com",
-	"version": "5.0.0",
+	"version": "5.0.1-alpha",
 	"bugs": {
 		"url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh"
 	},

diff --git a/projects/plugins/wpcomsh/wpcomsh.php b/projects/plugins/wpcomsh/wpcomsh.php
@@ -2,14 +2,14 @@
 /**
  * Plugin Name: WordPress.com Site Helper
  * Description: A helper for connecting WordPress.com sites to external host infrastructure.
- * Version: 5.0.0
+ * Version: 5.0.1-alpha
  * Author: Automattic
  * Author URI: http://automattic.com/
  *
  * @package wpcomsh
  */
 
-define( 'WPCOMSH_VERSION', '5.0.0' );
+define( 'WPCOMSH_VERSION', '5.0.1-alpha' );
 
 // If true, Typekit fonts will be available in addition to Google fonts
 add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );