Changeset 51463
- Timestamp:
- 07/19/2021 09:13:36 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
src/wp-admin/authorize-application.php (modified) (8 diffs)
-
src/wp-admin/includes/user.php (modified) (4 diffs)
-
src/wp-includes/class-wp-application-passwords.php (modified) (4 diffs)
-
src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php (modified) (3 diffs)
-
tests/qunit/fixtures/wp-api-generated.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/authorize-application.php
r50932 r51463 91 91 if ( wp_is_site_protected_by_basic_auth( 'front' ) ) { 92 92 wp_die( 93 __( 'Your website appears to use Basic Authentication, which is not currently compatible with Application Passwords.' ),93 __( 'Your website appears to use Basic Authentication, which is not currently compatible with application passwords.' ), 94 94 __( 'Cannot Authorize Application' ), 95 95 array( … … 148 148 printf( 149 149 /* translators: %s: Application name. */ 150 __( 'Would you like to give the application identifying itself as %s access to your account? You should only do this if you trust the app in question.' ),150 __( 'Would you like to give the application identifying itself as %s access to your account? You should only do this if you trust the application in question.' ), 151 151 '<strong>' . esc_html( $app_name ) . '</strong>' 152 152 ); … … 154 154 </p> 155 155 <?php else : ?> 156 <p><?php _e( 'Would you like to give this application access to your account? You should only do this if you trust the app in question.' ); ?></p>156 <p><?php _e( 'Would you like to give this application access to your account? You should only do this if you trust the application in question.' ); ?></p> 157 157 <?php endif; ?> 158 158 … … 248 248 <?php 249 249 submit_button( 250 __( 'Yes, I approve of this connection .' ),250 __( 'Yes, I approve of this connection' ), 251 251 'primary', 252 252 'approve', … … 263 263 /* translators: %s: The URL the user is being redirected to. */ 264 264 __( 'You will be sent to %s' ), 265 '<strong>< kbd>' . esc_html(265 '<strong><code>' . esc_html( 266 266 add_query_arg( 267 267 array( … … 272 272 $success_url 273 273 ) 274 ) . '</ kbd></strong>'274 ) . '</code></strong>' 275 275 ); 276 276 } else { … … 282 282 <?php 283 283 submit_button( 284 __( 'No, I do not approve of this connection .' ),284 __( 'No, I do not approve of this connection' ), 285 285 'secondary', 286 286 'reject', … … 297 297 /* translators: %s: The URL the user is being redirected to. */ 298 298 __( 'You will be sent to %s' ), 299 '<strong>< kbd>' . esc_html( $reject_url ) . '</kbd></strong>'299 '<strong><code>' . esc_html( $reject_url ) . '</code></strong>' 300 300 ); 301 301 } else { -
trunk/src/wp-admin/includes/user.php
r50981 r51463 605 605 * 606 606 * @type string $app_name The suggested name of the application. 607 * @type string $app_id A uuidprovided by the application to uniquely identify it.608 * @type string $success_url The urlthe user will be redirected to after approving the application.609 * @type string $reject_url The urlthe user will be redirected to after rejecting the application.607 * @type string $app_id A UUID provided by the application to uniquely identify it. 608 * @type string $success_url The URL the user will be redirected to after approving the application. 609 * @type string $reject_url The URL the user will be redirected to after rejecting the application. 610 610 * } 611 611 * @param WP_User $user The user authorizing the application. … … 621 621 $error->add( 622 622 'invalid_redirect_scheme', 623 __( 'The success urlmust be served over a secure connection.' )623 __( 'The success URL must be served over a secure connection.' ) 624 624 ); 625 625 } … … 632 632 $error->add( 633 633 'invalid_redirect_scheme', 634 __( 'The rejection urlmust be served over a secure connection.' )634 __( 'The rejection URL must be served over a secure connection.' ) 635 635 ); 636 636 } … … 640 640 $error->add( 641 641 'invalid_app_id', 642 __( 'The app id must be a uuid.' )642 __( 'The application ID must be a UUID.' ) 643 643 ); 644 644 } -
trunk/src/wp-includes/class-wp-application-passwords.php
r50057 r51463 152 152 153 153 /** 154 * Gets a user's application password with the given uuid.155 * 156 * @since 5.6.0 157 * 158 * @param int $user_id User ID. 159 * @param string $uuid The password's uuid.154 * Gets a user's application password with the given UUID. 155 * 156 * @since 5.6.0 157 * 158 * @param int $user_id User ID. 159 * @param string $uuid The password's UUID. 160 160 * @return array|null The application password if found, null otherwise. 161 161 */ … … 199 199 * 200 200 * @param int $user_id User ID. 201 * @param string $uuid The password's uuid.201 * @param string $uuid The password's UUID. 202 202 * @param array $update Information about the application password to update. 203 203 * @return true|WP_Error True if successful, otherwise a WP_Error instance is returned on error. … … 253 253 * 254 254 * @param int $user_id User ID. 255 * @param string $uuid The password's uuid.255 * @param string $uuid The password's UUID. 256 256 * @return true|WP_Error True if the usage was recorded, a WP_Error if an error occurs. 257 257 */ … … 291 291 * 292 292 * @param int $user_id User ID. 293 * @param string $uuid The password's uuid.293 * @param string $uuid The password's UUID. 294 294 * @return true|WP_Error Whether the password was successfully found and deleted, a WP_Error otherwise. 295 295 */ -
trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
r51000 r51463 492 492 return new WP_Error( 493 493 'rest_cannot_introspect_app_password_for_non_authenticated_user', 494 __( 'The authenticated Application Password can only be introspected for the current user.' ),494 __( 'The authenticated application password can only be introspected for the current user.' ), 495 495 array( 'status' => rest_authorization_required_code() ) 496 496 ); … … 520 520 return new WP_Error( 521 521 'rest_no_authenticated_app_password', 522 __( 'Cannot introspect Application Password.' ),522 __( 'Cannot introspect application password.' ), 523 523 array( 'status' => 404 ) 524 524 ); … … 789 789 ), 790 790 'app_id' => array( 791 'description' => __( 'A uuidprovided by the application to uniquely identify it. It is recommended to use an UUID v5 with the URL or DNS namespace.' ),791 'description' => __( 'A UUID provided by the application to uniquely identify it. It is recommended to use an UUID v5 with the URL or DNS namespace.' ), 792 792 'type' => 'string', 793 793 'format' => 'uuid', -
trunk/tests/qunit/fixtures/wp-api-generated.js
r51351 r51463 5781 5781 "args": { 5782 5782 "app_id": { 5783 "description": "A uuidprovided by the application to uniquely identify it. It is recommended to use an UUID v5 with the URL or DNS namespace.",5783 "description": "A UUID provided by the application to uniquely identify it. It is recommended to use an UUID v5 with the URL or DNS namespace.", 5784 5784 "type": "string", 5785 5785 "format": "uuid", … … 5865 5865 "args": { 5866 5866 "app_id": { 5867 "description": "A uuidprovided by the application to uniquely identify it. It is recommended to use an UUID v5 with the URL or DNS namespace.",5867 "description": "A UUID provided by the application to uniquely identify it. It is recommended to use an UUID v5 with the URL or DNS namespace.", 5868 5868 "type": "string", 5869 5869 "format": "uuid",
Note: See TracChangeset
for help on using the changeset viewer.