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
This commit is contained in:
parent
b317b87147
commit
13dbc8c063
|
@ -165,13 +165,21 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
|
||||||
?>
|
?>
|
||||||
<p>
|
<p>
|
||||||
<?php
|
<?php
|
||||||
printf(
|
/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
|
||||||
/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
|
$msg_fmt = _n(
|
||||||
_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">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>.',
|
||||||
'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
|
$blogs_count
|
||||||
),
|
);
|
||||||
|
}
|
||||||
|
printf(
|
||||||
|
$msg_fmt,
|
||||||
admin_url( 'my-sites.php' ),
|
admin_url( 'my-sites.php' ),
|
||||||
number_format_i18n( $blogs_count )
|
number_format_i18n( $blogs_count )
|
||||||
);
|
);
|
||||||
|
|
|
@ -746,13 +746,21 @@ switch ( $action ) {
|
||||||
?>
|
?>
|
||||||
<p>
|
<p>
|
||||||
<?php
|
<?php
|
||||||
printf(
|
/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
|
||||||
/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
|
$msg_fmt = _n(
|
||||||
_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">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>.',
|
||||||
'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
|
$blogs_count
|
||||||
),
|
);
|
||||||
|
}
|
||||||
|
printf(
|
||||||
|
$msg_fmt,
|
||||||
admin_url( 'my-sites.php' ),
|
admin_url( 'my-sites.php' ),
|
||||||
number_format_i18n( $blogs_count )
|
number_format_i18n( $blogs_count )
|
||||||
);
|
);
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @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.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue