From 318205d459a5a9fee3838dda88222a8e6921475f Mon Sep 17 00:00:00 2001 From: audrasjb Date: Fri, 4 Mar 2022 11:29:04 +0000 Subject: [PATCH] Coding Standards: Improve formatting in `/wp-admin/user-edit.php`. This change improves the formatting of `/wp-admin/user-edit.php` to avoid PHPCS failures when adding new code, which previously required new code to be indented multiple times, breaking alignment of the HTML parts. This change avoids disabling/enabling PHPCS for failing sniffs. Props costdev, johnregan3, peterwilsoncc. Fixes #54673. Built from https://develop.svn.wordpress.org/trunk@52820 git-svn-id: http://core.svn.wordpress.org/trunk@52409 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/user-edit.php | 1350 +++++++++++++++++++-------------------- wp-includes/version.php | 2 +- 2 files changed, 673 insertions(+), 679 deletions(-) diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 45fe5ecea3..ad0da5c8f0 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -197,704 +197,698 @@ switch ( $action ) { require_once ABSPATH . 'wp-admin/admin-header.php'; ?> - ID ) && current_user_can( 'manage_network_options' ) ) { ?> -

- + ID ) && current_user_can( 'manage_network_options' ) ) : ?> +

+ + -
- -

- -

- - -

- -
- - -
- -

- -
- - -

\n

", $errors->get_error_messages() ); ?>

- - -
-

- -

- - - - - - - -
- -
- > - - - - -

- - -

- -

- - - - - - - - - - - - - - - - - - 1 && has_action( 'admin_color_scheme_picker' ) ) : ?> - - - - - 1 ?> - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - ID ) ) : ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - $desc ) { - ?> - - - - - - - -

- - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - get_all() ) === 1 ) : - ?> - - - - -get_all() ) > 1 ) : ?> - - - - -get_all() ) : ?> - - - - - + +
+ +

+ +
+ - + +
+

\n

", $errors->get_error_messages() ); ?>

+
+ - -
-

-

- - 1 ) { - ?> -

- the %2$s site in this installation that you have permissions on.', - 'Application passwords grant access to all %2$s sites in this installation that you have permissions on.', - $blogs_count - ), - admin_url( 'my-sites.php' ), - number_format_i18n( $blogs_count ) - ); - ?> -

- +

+ +

- if ( ! wp_is_site_protected_by_basic_auth( 'front' ) ) { - ?> -
-
- - -

-
+ + + + + + + +
+ + + > + + + + +

+ + +

- -
- -
-

-
- +

-
- 'application-passwords-user' ) ); - $application_passwords_list_table->prepare_items(); - $application_passwords_list_table->display(); - ?> -
- -

-

+ + + + + + + + + + + + + + + + + + 1 && has_action( 'admin_color_scheme_picker' ) ) : ?> + + + + + 1 ?> + + + + + + + + + + + + + + + + + + + + + + + + set the environment type accordingly to enable application passwords.' ), - __( 'https://wordpress.org/support/article/editing-wp-config-php/#wp_environment_type' ) - ); - ?> -

- -
- - - - - caps ) > count( $profile_user->roles ) - && apply_filters( 'additional_capabilities_display', true, $profile_user ) - ) : - ?> -

- - - - - - - + ?> - - +

- + + + + + - - + ID ) ) : ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + $desc ) : ?> + + + + + + + +

+ + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + get_all() ) === 1 ) : ?> + + + + + get_all() ) > 1 ) : ?> + + + + + get_all() ) : ?> + + + + + + + + +
+

+

+ + 1 ) : + ?> +

+ the %2$s site in this installation that you have permissions on.', + 'Application passwords grant access to all %2$s sites in this installation that you have permissions on.', + $blogs_count + ), + admin_url( 'my-sites.php' ), + number_format_i18n( $blogs_count ) + ); + ?> +

+ + + +
+
+ + +

+
+ + + + +
+ +
+

+
+ + +
+ 'application-passwords-user' ) ); + $application_passwords_list_table->prepare_items(); + $application_passwords_list_table->display(); + ?> +
+ +

+

+ set the environment type accordingly to enable application passwords.' ), + __( 'https://wordpress.org/support/article/editing-wp-config-php/#wp_environment_type' ) + ); + ?> +

+ +
+ + + + + + + caps ) > count( $profile_user->roles ) && ( true === $display_additional_caps ) ) : ?> +

+ + + + + + + + + + + + + + + +