From 13dbc8c063b4be8aa335119c0ca4361af526d9aa Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Thu, 7 Apr 2022 23:16:02 +0000
Subject: [PATCH] Application Passwords: Use a more appropriate helper text
 message for super-admins.

Previously, the helper text of the application password section was misleading for a Super Admin because an application password for a Super Admin grants access to all sites on the network, not just ones that they are a member of. This changeset provides a slightly different message for Super admin role.

Props johnbillion, rsiddharth, audrasjb.
Fixes #53234

Built from https://develop.svn.wordpress.org/trunk@53101


git-svn-id: http://core.svn.wordpress.org/trunk@52690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/authorize-application.php | 20 ++++++++++++++------
 wp-admin/user-edit.php             | 20 ++++++++++++++------
 wp-includes/version.php            |  2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/wp-admin/authorize-application.php b/wp-admin/authorize-application.php
index d4104297ef..641721ebae 100644
--- a/wp-admin/authorize-application.php
+++ b/wp-admin/authorize-application.php
@@ -165,13 +165,21 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 				?>
 				<p>
 					<?php
-					printf(
-						/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
-						_n(
-							'This will grant access to <a href="%1$s">the %2$s site in this installation that you have permissions on</a>.',
-							'This will grant access to <a href="%1$s">all %2$s sites in this installation that you have permissions on</a>.',
+					/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
+					$msg_fmt  = _n(
+						'This will grant access to <a href="%1$s">the %2$s site in this installation that you have permissions on</a>.',
+						'This will grant access to <a href="%1$s">all %2$s sites in this installation that you have permissions on</a>.',
+						$blogs_count
+					);
+					if ( is_super_admin() ) {
+						$msg_fmt  = _n(
+							'This will grant access to <a href="%1$s">the %2$s site on the network as you have Super Admin rights</a>.',
+							'This will grant access to <a href="%1$s">all %2$s sites on the network as you have Super Admin rights</a>.',
 							$blogs_count
-						),
+						);
+					}
+					printf(
+						$msg_fmt,
 						admin_url( 'my-sites.php' ),
 						number_format_i18n( $blogs_count )
 					);
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index ad0da5c8f0..82a3db1bb1 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -746,13 +746,21 @@ switch ( $action ) {
 										?>
 										<p>
 											<?php
-											printf(
-												/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
-												_n(
-													'Application passwords grant access to <a href="%1$s">the %2$s site in this installation that you have permissions on</a>.',
-													'Application passwords grant access to <a href="%1$s">all %2$s sites in this installation that you have permissions on</a>.',
+											/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
+											$msg_fmt = _n(
+												'Application passwords grant access to <a href="%1$s">the %2$s site in this installation that you have permissions on</a>.',
+												'Application passwords grant access to <a href="%1$s">all %2$s sites in this installation that you have permissions on</a>.',
+												$blogs_count
+											);
+											if ( is_super_admin( $user_id ) ) {
+												$msg_fmt = _n(
+													'Application passwords grant access to <a href="%1$s">the %2$s site on the network as you have Super Admin rights</a>.',
+													'Application passwords grant access to <a href="%1$s">all %2$s sites on the network as you have Super Admin rights</a>.',
 													$blogs_count
-												),
+												);
+											}
+											printf(
+												$msg_fmt,
 												admin_url( 'my-sites.php' ),
 												number_format_i18n( $blogs_count )
 											);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e4058e8822..b48363fede 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-53100';
+$wp_version = '6.0-alpha-53101';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.