Ticket #51513: 51513.diff
| File 51513.diff, 5.8 KB (added by , 5 years ago) |
|---|
-
src/wp-admin/authorize-application.php
70 70 ); 71 71 } 72 72 73 if ( ! wp_ is_application_passwords_available_for_user( $user ) ) {74 if ( wp_ is_application_passwords_available() ) {73 if ( ! wp_application_passwords_enabled_for_user( $user ) ) { 74 if ( wp_application_passwords_enabled() ) { 75 75 $message = __( 'Application passwords are not enabled for your account. Please contact the site administrator for assistance.' ); 76 76 } else { 77 77 $message = __( 'Application passwords are not enabled.' ); -
src/wp-admin/user-edit.php
27 27 28 28 wp_enqueue_script( 'user-profile' ); 29 29 30 if ( wp_ is_application_passwords_available_for_user( $user_id ) ) {30 if ( wp_application_passwords_enabled_for_user( $user_id ) ) { 31 31 wp_enqueue_script( 'application-passwords' ); 32 32 } 33 33 … … 707 707 </table> 708 708 709 709 710 <?php if ( wp_ is_application_passwords_available_for_user( $user_id ) ) : ?>710 <?php if ( wp_application_passwords_enabled_for_user( $user_id ) ) : ?> 711 711 <div class="application-passwords hide-if-no-js" id="application-passwords-section"> 712 712 <h2><?php _e( 'Application Passwords' ); ?></h2> 713 713 <p><?php _e( 'Application passwords allow authentication via non-interactive systems, such as XML-RPC or the REST API, without providing your actual password. Application passwords can be easily revoked. They cannot be used for traditional logins to your website.' ); ?></p> -
src/wp-includes/rest-api.php
1100 1100 * @return WP_REST_Response 1101 1101 */ 1102 1102 function rest_add_application_passwords_to_index( $response ) { 1103 if ( ! wp_ is_application_passwords_available() ) {1103 if ( ! wp_application_passwords_enabled() ) { 1104 1104 return $response; 1105 1105 } 1106 1106 -
src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
495 495 * @return WP_User|WP_Error The WordPress user associated with the request, or a WP_Error if none found. 496 496 */ 497 497 protected function get_user( $request ) { 498 if ( ! wp_ is_application_passwords_available() ) {498 if ( ! wp_application_passwords_enabled() ) { 499 499 return new WP_Error( 500 500 'application_passwords_disabled', 501 501 __( 'Application passwords are not enabled.' ), … … 539 539 return $error; 540 540 } 541 541 542 if ( ! wp_ is_application_passwords_available_for_user( $user ) ) {542 if ( ! wp_application_passwords_enabled_for_user( $user ) ) { 543 543 return new WP_Error( 544 544 'application_passwords_disabled_for_user', 545 545 __( 'Application passwords are not enabled for your account. Please contact the site administrator for assistance.' ), -
src/wp-includes/user.php
350 350 __( 'Unknown username. Check again or try your email address.' ) 351 351 ); 352 352 } 353 } elseif ( ! wp_ is_application_passwords_available_for_user( $user ) ) {353 } elseif ( ! wp_application_passwords_enabled_for_user( $user ) ) { 354 354 $error = new WP_Error( 355 355 'application_passwords_disabled', 356 356 __( 'Application passwords are disabled for the requested user.' ) … … 448 448 return $input_user; 449 449 } 450 450 451 if ( ! wp_ is_application_passwords_available() ) {451 if ( ! wp_application_passwords_enabled() ) { 452 452 return $input_user; 453 453 } 454 454 … … 4098 4098 * Checks if Application Passwords is globally available. 4099 4099 * 4100 4100 * By default, Application Passwords is available to all sites using SSL or to local environments. 4101 * Use {@see 'wp_ is_application_passwords_available'} to adjust its availability.4101 * Use {@see 'wp_application_passwords_enabled'} to adjust its availability. 4102 4102 * 4103 4103 * @since 5.6.0 4104 4104 * 4105 4105 * @return bool 4106 4106 */ 4107 function wp_ is_application_passwords_available() {4107 function wp_application_passwords_enabled() { 4108 4108 $available = is_ssl() || 'local' === wp_get_environment_type(); 4109 4109 4110 4110 /** … … 4114 4114 * 4115 4115 * @param bool $available True if available, false otherwise. 4116 4116 */ 4117 return apply_filters( 'wp_ is_application_passwords_available', $available );4117 return apply_filters( 'wp_application_passwords_enabled', $available ); 4118 4118 } 4119 4119 4120 4120 /** 4121 4121 * Checks if Application Passwords is enabled for a specific user. 4122 4122 * 4123 * By default all users can use Application Passwords. Use {@see 'wp_ is_application_passwords_available_for_user'}4123 * By default all users can use Application Passwords. Use {@see 'wp_application_passwords_enabled_for_user'} 4124 4124 * to restrict availability to certain users. 4125 4125 * 4126 4126 * @since 5.6.0 … … 4128 4128 * @param int|WP_User $user The user to check. 4129 4129 * @return bool 4130 4130 */ 4131 function wp_ is_application_passwords_available_for_user( $user ) {4132 if ( ! wp_ is_application_passwords_available() ) {4131 function wp_application_passwords_enabled_for_user( $user ) { 4132 if ( ! wp_application_passwords_enabled() ) { 4133 4133 return false; 4134 4134 } 4135 4135 … … 4149 4149 * @param bool $available True if available, false otherwise. 4150 4150 * @param WP_User $user The user to check. 4151 4151 */ 4152 return apply_filters( 'wp_ is_application_passwords_available_for_user', true, $user );4152 return apply_filters( 'wp_application_passwords_enabled_for_user', true, $user ); 4153 4153 }