Skip to content

Commit 30ecb08

Browse files
committed
Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into trac-48456-codemirror-v5-upgrade
* 'trunk' of https://github.com/WordPress/wordpress-develop: External Libraries: Upgrade CodeMirror to latest v5 in addition to updating CSSLint, Esprima, HTMLHint, and JSONLint. Docs: Add missing descriptions for some user function parameters.
2 parents 26921c8 + 438132f commit 30ecb08

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/wp-admin/includes/user.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ function wp_revoke_user( $id ) {
482482
/**
483483
* @since 2.8.0
484484
*
485-
* @global int $user_ID
485+
* @global int $user_ID Current user ID.
486486
*
487487
* @param false $errors Deprecated.
488488
*/
@@ -505,8 +505,8 @@ function default_password_nag_handler( $errors = false ) {
505505
/**
506506
* @since 2.8.0
507507
*
508-
* @param int $user_ID
509-
* @param WP_User $old_data
508+
* @param int $user_ID User ID.
509+
* @param WP_User $old_data The user object before the update.
510510
*/
511511
function default_password_nag_edit_user( $user_ID, $old_data ) {
512512
// Short-circuit it.
@@ -602,7 +602,7 @@ function use_ssl_preference( $user ) {
602602
/**
603603
* @since MU (3.0.0)
604604
*
605-
* @param string $text
605+
* @param string $text The email body text.
606606
* @return string User site invitation email message.
607607
*/
608608
function admin_created_user_email( $text ) {

0 commit comments

Comments
 (0)