From aef504acfd2a04a4666b9839583c773d8022b45f Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 21 Sep 2020 16:46:06 +0000 Subject: [PATCH] Docs: Correct the indentation for some array type docs. See #50768 Built from https://develop.svn.wordpress.org/trunk@49028 git-svn-id: http://core.svn.wordpress.org/trunk@48790 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-core-upgrader.php | 14 +++---- wp-includes/functions.php | 22 +++++----- wp-includes/ms-functions.php | 22 +++++----- wp-includes/user.php | 50 +++++++++++------------ wp-includes/version.php | 2 +- 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php index d7305589bf..4184bc8ea9 100644 --- a/wp-admin/includes/class-core-upgrader.php +++ b/wp-admin/includes/class-core-upgrader.php @@ -48,14 +48,14 @@ class Core_Upgrader extends WP_Upgrader { * * @param object $current Response object for whether WordPress is current. * @param array $args { - * Optional. Arguments for upgrading WordPress core. Default empty array. + * Optional. Arguments for upgrading WordPress core. Default empty array. * - * @type bool $pre_check_md5 Whether to check the file checksums before - * attempting the upgrade. Default true. - * @type bool $attempt_rollback Whether to attempt to rollback the chances if - * there is a problem. Default false. - * @type bool $do_rollback Whether to perform this "upgrade" as a rollback. - * Default false. + * @type bool $pre_check_md5 Whether to check the file checksums before + * attempting the upgrade. Default true. + * @type bool $attempt_rollback Whether to attempt to rollback the chances if + * there is a problem. Default false. + * @type bool $do_rollback Whether to perform this "upgrade" as a rollback. + * Default false. * } * @return string|false|WP_Error New WordPress version on success, false or WP_Error on failure. */ diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 8d8e5001e2..51202a5318 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -7072,18 +7072,18 @@ All at ###SITENAME### * @since 4.9.0 * * @param array $email_change_email { - * Used to build wp_mail(). + * Used to build wp_mail(). * - * @type string $to The intended recipient. - * @type string $subject The subject of the email. - * @type string $message The content of the email. - * The following strings have a special meaning and will get replaced dynamically: - * - ###OLD_EMAIL### The old site admin email address. - * - ###NEW_EMAIL### The new site admin email address. - * - ###SITENAME### The name of the site. - * - ###SITEURL### The URL to the site. - * @type string $headers Headers. - * } + * @type string $to The intended recipient. + * @type string $subject The subject of the email. + * @type string $message The content of the email. + * The following strings have a special meaning and will get replaced dynamically: + * - ###OLD_EMAIL### The old site admin email address. + * - ###NEW_EMAIL### The new site admin email address. + * - ###SITENAME### The name of the site. + * - ###SITEURL### The URL to the site. + * @type string $headers Headers. + * } * @param string $old_email The old site admin email address. * @param string $new_email The new site admin email address. */ diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index bfb2b157e1..8f673ce5bc 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -2835,18 +2835,18 @@ All at ###SITENAME### * @since 4.9.0 * * @param array $email_change_email { - * Used to build wp_mail(). + * Used to build wp_mail(). * - * @type string $to The intended recipient. - * @type string $subject The subject of the email. - * @type string $message The content of the email. - * The following strings have a special meaning and will get replaced dynamically: - * - ###OLD_EMAIL### The old network admin email address. - * - ###NEW_EMAIL### The new network admin email address. - * - ###SITENAME### The name of the network. - * - ###SITEURL### The URL to the site. - * @type string $headers Headers. - * } + * @type string $to The intended recipient. + * @type string $subject The subject of the email. + * @type string $message The content of the email. + * The following strings have a special meaning and will get replaced dynamically: + * - ###OLD_EMAIL### The old network admin email address. + * - ###NEW_EMAIL### The new network admin email address. + * - ###SITENAME### The name of the network. + * - ###SITEURL### The URL to the site. + * @type string $headers Headers. + * } * @param string $old_email The old network admin email address. * @param string $new_email The new network admin email address. * @param int $network_id ID of the network. diff --git a/wp-includes/user.php b/wp-includes/user.php index 22a9639033..6a2bf20ca9 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -2049,19 +2049,19 @@ All at ###SITENAME### * @since 4.3.0 * * @param array $pass_change_email { - * Used to build wp_mail(). + * Used to build wp_mail(). * - * @type string $to The intended recipients. Add emails in a comma separated string. - * @type string $subject The subject of the email. - * @type string $message The content of the email. - * The following strings have a special meaning and will get replaced dynamically: - * - ###USERNAME### The current user's username. - * - ###ADMIN_EMAIL### The admin email in case this was unexpected. - * - ###EMAIL### The user's email address. - * - ###SITENAME### The name of the site. - * - ###SITEURL### The URL to the site. - * @type string $headers Headers. Add headers in a newline (\r\n) separated string. - * } + * @type string $to The intended recipients. Add emails in a comma separated string. + * @type string $subject The subject of the email. + * @type string $message The content of the email. + * The following strings have a special meaning and will get replaced dynamically: + * - ###USERNAME### The current user's username. + * - ###ADMIN_EMAIL### The admin email in case this was unexpected. + * - ###EMAIL### The user's email address. + * - ###SITENAME### The name of the site. + * - ###SITEURL### The URL to the site. + * @type string $headers Headers. Add headers in a newline (\r\n) separated string. + * } * @param array $user The original user array. * @param array $userdata The updated user array. */ @@ -2107,20 +2107,20 @@ All at ###SITENAME### * @since 4.3.0 * * @param array $email_change_email { - * Used to build wp_mail(). + * Used to build wp_mail(). * - * @type string $to The intended recipients. - * @type string $subject The subject of the email. - * @type string $message The content of the email. - * The following strings have a special meaning and will get replaced dynamically: - * - ###USERNAME### The current user's username. - * - ###ADMIN_EMAIL### The admin email in case this was unexpected. - * - ###NEW_EMAIL### The new email address. - * - ###EMAIL### The old email address. - * - ###SITENAME### The name of the site. - * - ###SITEURL### The URL to the site. - * @type string $headers Headers. - * } + * @type string $to The intended recipients. + * @type string $subject The subject of the email. + * @type string $message The content of the email. + * The following strings have a special meaning and will get replaced dynamically: + * - ###USERNAME### The current user's username. + * - ###ADMIN_EMAIL### The admin email in case this was unexpected. + * - ###NEW_EMAIL### The new email address. + * - ###EMAIL### The old email address. + * - ###SITENAME### The name of the site. + * - ###SITEURL### The URL to the site. + * @type string $headers Headers. + * } * @param array $user The original user array. * @param array $userdata The updated user array. */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 28d0d94b9e..d533be3b60 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-alpha-49027'; +$wp_version = '5.6-alpha-49028'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.