From e4cfebe92ebac3af7795e723ab8646b71098b9b7 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Thu, 1 Jul 2021 21:29:56 +0000 Subject: [PATCH] Docs: Undo the accidental revert of [51299] made in [51300]. See #53399 Built from https://develop.svn.wordpress.org/trunk@51301 git-svn-id: http://core.svn.wordpress.org/trunk@50910 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-supports/elements.php | 16 ++++----- wp-includes/block-supports/layout.php | 6 ++-- wp-includes/class-http.php | 2 +- wp-includes/class-wp-query.php | 20 ++++++------ wp-includes/class-wp-term-query.php | 43 +++++++++++++------------ wp-includes/load.php | 2 +- wp-includes/nav-menu.php | 2 +- wp-includes/pluggable.php | 3 +- wp-includes/post.php | 8 ++--- wp-includes/version.php | 2 +- 10 files changed, 52 insertions(+), 52 deletions(-) diff --git a/wp-includes/block-supports/elements.php b/wp-includes/block-supports/elements.php index 3496095651..4e43dda375 100644 --- a/wp-includes/block-supports/elements.php +++ b/wp-includes/block-supports/elements.php @@ -12,9 +12,9 @@ * @since 5.8.0 * @access private * - * @param string $block_content Rendered block content. - * @param array $block Block object. - * @return string Filtered block content. + * @param string $block_content Rendered block content. + * @param array $block Block object. + * @return string Filtered block content. */ function wp_render_elements_support( $block_content, $block ) { $link_color = null; @@ -23,11 +23,11 @@ function wp_render_elements_support( $block_content, $block ) { } /* - * For now we only care about link color. - * This code in the future when we have a public API - * should take advantage of WP_Theme_JSON::compute_style_properties - * and work for any element and style. - */ + * For now we only care about link color. + * This code in the future when we have a public API + * should take advantage of WP_Theme_JSON::compute_style_properties + * and work for any element and style. + */ if ( null === $link_color ) { return $block_content; } diff --git a/wp-includes/block-supports/layout.php b/wp-includes/block-supports/layout.php index a28a51b4a3..16e070a7d3 100644 --- a/wp-includes/block-supports/layout.php +++ b/wp-includes/block-supports/layout.php @@ -35,9 +35,9 @@ function wp_register_layout_support( $block_type ) { * @since 5.8.0 * @access private * - * @param string $block_content Rendered block content. - * @param array $block Block object. - * @return string Filtered block content. + * @param string $block_content Rendered block content. + * @param array $block Block object. + * @return string Filtered block content. */ function wp_render_layout_support_flag( $block_content, $block ) { $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] ); diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index 6a69b2462d..703a74e208 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -110,7 +110,7 @@ class WP_Http { * Some transports technically allow others, but should not be * assumed. Default 'GET'. * @type float $timeout How long the connection should stay open in seconds. Default 5. - * @type int $redirection Number of allowed redirects. Not supported by all transports + * @type int $redirection Number of allowed redirects. Not supported by all transports. * Default 5. * @type string $httpversion Version of the HTTP protocol to use. Accepts '1.0' and '1.1'. * Default '1.0'. diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php index bc1131ed5b..09c6a22b0d 100644 --- a/wp-includes/class-wp-query.php +++ b/wp-includes/class-wp-query.php @@ -18,7 +18,7 @@ class WP_Query { /** - * Query vars set by the user + * Query vars set by the user. * * @since 1.5.0 * @var array @@ -26,7 +26,7 @@ class WP_Query { public $query; /** - * Query vars, after parsing + * Query vars, after parsing. * * @since 1.5.0 * @var array @@ -34,7 +34,7 @@ class WP_Query { public $query_vars = array(); /** - * Taxonomy query, as passed to get_tax_sql() + * Taxonomy query, as passed to get_tax_sql(). * * @since 3.1.0 * @var WP_Tax_Query A taxonomy query instance. @@ -42,7 +42,7 @@ class WP_Query { public $tax_query; /** - * Metadata query container + * Metadata query container. * * @since 3.2.0 * @var WP_Meta_Query A meta query instance. @@ -50,7 +50,7 @@ class WP_Query { public $meta_query = false; /** - * Date query container + * Date query container. * * @since 3.7.0 * @var WP_Date_Query A date query instance. @@ -92,7 +92,7 @@ class WP_Query { public $posts; /** - * The amount of posts for the current query. + * The number of posts for the current query. * * @since 1.5.0 * @var int @@ -135,7 +135,7 @@ class WP_Query { public $comments; /** - * The amount of comments for the posts. + * The number of comments for the posts. * * @since 2.2.0 * @var int @@ -159,7 +159,7 @@ class WP_Query { public $comment; /** - * The amount of found posts for the current query. + * The number of found posts for the current query. * * If limit clause was not used, equals $post_count. * @@ -169,7 +169,7 @@ class WP_Query { public $found_posts = 0; /** - * The amount of pages. + * The number of pages. * * @since 2.1.0 * @var int @@ -177,7 +177,7 @@ class WP_Query { public $max_num_pages = 0; /** - * The amount of comment pages. + * The number of comment pages. * * @since 2.7.0 * @var int diff --git a/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php index b787d18617..3fd72993cd 100644 --- a/wp-includes/class-wp-term-query.php +++ b/wp-includes/class-wp-term-query.php @@ -92,22 +92,23 @@ class WP_Term_Query { * @param string|array $query { * Optional. Array or query string of term query parameters. Default empty. * - * @type string|array $taxonomy Taxonomy name, or array of taxonomy names, to which results should + * @type string|array $taxonomy Taxonomy name, or array of taxonomies, to which results should * be limited. - * @type int|int[] $object_ids Optional. Object ID, or array of object IDs. Results will be + * @type int|int[] $object_ids Object ID, or array of object IDs. Results will be * limited to terms associated with these objects. * @type string $orderby Field(s) to order terms by. Accepts: - * * term fields ('name', 'slug', 'term_group', 'term_id', 'id', + * * Term fields ('name', 'slug', 'term_group', 'term_id', 'id', * 'description', 'parent', 'term_order'). Unless `$object_ids` * is not empty, 'term_order' is treated the same as 'term_id'. * * 'count' to use the number of objects associated with the term. - * * 'include' to match the 'order' of the $include param. - * * 'slug__in' to match the 'order' of the $slug param. - * * 'meta_value', 'meta_value_num'. - * the value of `$meta_key`. - * the array keys of `$meta_query`. + * * 'include' to match the 'order' of the `$include` param. + * * 'slug__in' to match the 'order' of the `$slug` param. + * * 'meta_value' + * * 'meta_value_num'. + * * The value of `$meta_key`. + * * The array keys of `$meta_query`. * * 'none' to omit the ORDER BY clause. - * Defaults to 'name'. + * Default 'name'. * @type string $order Whether to order terms in ascending or descending order. * Accepts 'ASC' (ascending) or 'DESC' (descending). * Default 'ASC'. @@ -116,14 +117,14 @@ class WP_Term_Query { * @type int[]|string $include Array or comma/space-separated string of term IDs to include. * Default empty array. * @type int[]|string $exclude Array or comma/space-separated string of term IDs to exclude. - * If $include is non-empty, $exclude is ignored. + * If `$include` is non-empty, `$exclude` is ignored. * Default empty array. * @type int[]|string $exclude_tree Array or comma/space-separated string of term IDs to exclude - * along with all of their descendant terms. If $include is - * non-empty, $exclude_tree is ignored. Default empty array. + * along with all of their descendant terms. If `$include` is + * non-empty, `$exclude_tree` is ignored. Default empty array. * @type int|string $number Maximum number of terms to return. Accepts ''|0 (all) or any * positive number. Default ''|0 (all). Note that $number may - * not return accurate results when coupled with $object_ids. + * not return accurate results when coupled with `$object_ids`. * See #41796 for details. * @type int $offset The number by which to offset the terms query. Default empty. * @type string $fields Term fields to query for. Accepts: @@ -145,14 +146,14 @@ class WP_Term_Query { * Default 'all'. * @type bool $count Whether to return a term count. If true, will take precedence * over `$fields`. Default false. - * @type string|array $name Optional. Name or array of names to return term(s) for. + * @type string|array $name Name or array of names to return term(s) for. * Default empty. - * @type string|array $slug Optional. Slug or array of slugs to return term(s) for. + * @type string|array $slug Slug or array of slugs to return term(s) for. * Default empty. - * @type int|int[] $term_taxonomy_id Optional. Term taxonomy ID, or array of term taxonomy IDs, + * @type int|int[] $term_taxonomy_id Term taxonomy ID, or array of term taxonomy IDs, * to match when querying terms. * @type bool $hierarchical Whether to include terms that have non-empty descendants - * (even if $hide_empty is set to true). Default true. + * (even if `$hide_empty` is set to true). Default true. * @type string $search Search criteria to match terms. Will be SQL-formatted with * wildcards before and after. Default empty. * @type string $name__like Retrieve terms with criteria by which a term is LIKE @@ -163,8 +164,8 @@ class WP_Term_Query { * quantity of each term's "count" object variable. * Default false. * @type string $get Whether to return terms regardless of ancestry or whether the - * terms are empty. Accepts 'all' or empty (disabled). - * Default empty. + * terms are empty. Accepts 'all' or '' (disabled). + * Default ''. * @type int $child_of Term ID to retrieve child terms of. If multiple taxonomies * are passed, `$child_of` is ignored. Default 0. * @type int $parent Parent term ID to retrieve direct-child terms of. @@ -173,9 +174,9 @@ class WP_Term_Query { * This parameter has no effect on non-hierarchical taxonomies. * Default false. * @type string $cache_domain Unique cache key to be produced when this query is stored in - * an object cache. Default is 'core'. + * an object cache. Default 'core'. * @type bool $update_term_meta_cache Whether to prime meta caches for matched terms. Default true. - * @type array $meta_query Optional. Meta query clauses to limit retrieved terms by. + * @type array $meta_query Meta query clauses to limit retrieved terms by. * See `WP_Meta_Query`. Default empty. * @type string $meta_key Limit terms to those matching a specific metadata key. * Can be used in conjunction with `$meta_value`. Default empty. diff --git a/wp-includes/load.php b/wp-includes/load.php index efe69a67d7..812569305a 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -675,7 +675,7 @@ function wp_start_object_cache() { * @since 5.8.0 * * @param bool $enable_object_cache Whether to enable loading object-cache.php (if present). - * Default true. + * Default true. */ if ( $first_init && apply_filters( 'enable_loading_object_cache_dropin', true ) ) { if ( ! function_exists( 'wp_cache_init' ) ) { diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index df10ffc45b..2aa147f867 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -159,7 +159,7 @@ function get_registered_nav_menus() { * * @since 3.0.0 * - * @return int[] Associative array of egistered navigation menu IDs keyed by their + * @return int[] Associative array of registered navigation menu IDs keyed by their * location name. If none are registered, an empty array. */ function get_nav_menu_locations() { diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index f164eb2cbb..4a5891b8fd 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -2785,8 +2785,7 @@ if ( ! function_exists( 'get_avatar' ) ) : * @param int $size Square avatar width and height in pixels to retrieve. * @param string $default URL for the default image or a default type. Accepts '404', 'retro', 'monsterid', * 'wavatar', 'indenticon', 'mystery', 'mm', 'mysteryman', 'blank', or 'gravatar_default'. - * Default is the value of the 'avatar_default' option, with a fallback of 'mystery'. - * @param string $alt Alternative text to use in the avatar image tag. Default empty. + * @param string $alt Alternative text to use in the avatar image tag. * @param array $args Arguments passed to get_avatar_data(), after processing. */ return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args ); diff --git a/wp-includes/post.php b/wp-includes/post.php index ad140f28d5..20072bdcdb 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1391,7 +1391,7 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) * @type bool $public Whether a post type is intended for use publicly either via * the admin interface or by front-end users. While the default * settings of $exclude_from_search, $publicly_queryable, $show_ui, - * and $show_in_nav_menus are inherited from public, each does not + * and $show_in_nav_menus are inherited from $public, each does not * rely on this relationship and controls a very specific intention. * Default false. * @type bool $hierarchical Whether the post type is hierarchical (e.g. page). Default false. @@ -1417,11 +1417,11 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) * of $show_in_menu. * @type bool $show_in_rest Whether to include the post type in the REST API. Set this to true * for the post type to be available in the block editor. - * @type string $rest_base To change the base url of REST API route. Default is $post_type. - * @type string $rest_controller_class REST API Controller class name. Default is 'WP_REST_Posts_Controller'. + * @type string $rest_base To change the base URL of REST API route. Default is $post_type. + * @type string $rest_controller_class REST API controller class name. Default is 'WP_REST_Posts_Controller'. * @type int $menu_position The position in the menu order the post type should appear. To work, * $show_in_menu must be true. Default null (at the bottom). - * @type string $menu_icon The url to the icon to be used for this menu. Pass a base64-encoded + * @type string $menu_icon The URL to the icon to be used for this menu. Pass a base64-encoded * SVG using a data URI, which will be colored to match the color scheme * -- this should begin with 'data:image/svg+xml;base64,'. Pass the name * of a Dashicons helper class to use a font icon, e.g. diff --git a/wp-includes/version.php b/wp-includes/version.php index 72ab7961a8..001a90aa19 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-alpha-51300'; +$wp_version = '5.9-alpha-51301'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.