From 6cb050d87897e9c83750cdb7bd9bfcdee6204da2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 12 Dec 2021 14:54:00 +0000 Subject: [PATCH] Docs: Capitalize "ID", when referring to a post ID, term ID, etc. in a more consistent way. Follow-up to [48104]. See #53399. Built from https://develop.svn.wordpress.org/trunk@52357 git-svn-id: http://core.svn.wordpress.org/trunk@51949 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/image.php | 8 ++++---- wp-includes/class-wp-block-template.php | 4 ++-- wp-includes/link-template.php | 2 +- wp-includes/taxonomy.php | 16 ++++++++-------- wp-includes/version.php | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index 1ae105d65d..4d6e99f749 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -222,7 +222,7 @@ function _wp_image_meta_replace_original( $saved_data, $original_file, $image_me * @since 5.3.0 * * @param string $file Full path to the image file. - * @param int $attachment_id Attachment Id to process. + * @param int $attachment_id Attachment ID to process. * @return array The image attachment meta data. */ function wp_create_image_subsizes( $file, $attachment_id ) { @@ -380,7 +380,7 @@ function wp_create_image_subsizes( $file, $attachment_id ) { * @param array $new_sizes Array defining what sizes to create. * @param string $file Full path to the image file. * @param array $image_meta The attachment meta data array. - * @param int $attachment_id Attachment Id to process. + * @param int $attachment_id Attachment ID to process. * @return array The attachment meta data with updated `sizes` array. Includes an array of errors encountered while resizing. */ function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id ) { @@ -470,8 +470,8 @@ function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id ) { * * @since 2.1.0 * - * @param int $attachment_id Attachment Id to process. - * @param string $file Filepath of the Attached image. + * @param int $attachment_id Attachment ID to process. + * @param string $file Filepath of the attached image. * @return array Metadata for attachment. */ function wp_generate_attachment_metadata( $attachment_id, $file ) { diff --git a/wp-includes/class-wp-block-template.php b/wp-includes/class-wp-block-template.php index 3cd81402db..b331fa1274 100644 --- a/wp-includes/class-wp-block-template.php +++ b/wp-includes/class-wp-block-template.php @@ -38,7 +38,7 @@ class WP_Block_Template { public $slug; /** - * Id. + * ID. * * @since 5.8.0 * @var string @@ -88,7 +88,7 @@ class WP_Block_Template { public $origin; /** - * Post Id. + * Post ID. * * @since 5.8.0 * @var int|null diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index afa8933e35..904ec50749 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -3987,7 +3987,7 @@ function rel_canonical() { * @since 3.0.0 * * @param int $id Optional. A post or site ID. Default is 0, which means the current post or site. - * @param string $context Optional. Whether the ID is a 'site' id, 'post' id, or 'media' id. If 'post', + * @param string $context Optional. Whether the ID is a 'site' ID, 'post' ID, or 'media' ID. If 'post', * the post_type of the post is consulted. If 'query', the current query is consulted * to determine the ID and context. Default 'post'. * @param bool $allow_slugs Optional. Whether to allow post slugs in the shortlink. It is up to the plugin how diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 7558c7712e..1ead9f7f46 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -1142,8 +1142,8 @@ function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter * * @since 2.3.0 * - * @param int $term_id ID of Term to get children. - * @param string $taxonomy Taxonomy Name. + * @param int $term_id ID of term to get children. + * @param string $taxonomy Taxonomy name. * @return array|WP_Error List of Term IDs. WP_Error returned if `$taxonomy` does not exist. */ function get_term_children( $term_id, $taxonomy ) { @@ -1186,7 +1186,7 @@ function get_term_children( $term_id, $taxonomy ) { * * @param string $field Term field to fetch. * @param int|WP_Term $term Term ID or object. - * @param string $taxonomy Optional. Taxonomy Name. Default empty. + * @param string $taxonomy Optional. Taxonomy name. Default empty. * @param string $context Optional. How to sanitize term fields. Look at sanitize_term_field() for available options. * Default 'display'. * @return string|int|null|WP_Error Will return an empty string if $term is not an object or if $field is not set in $term. @@ -1686,7 +1686,7 @@ function sanitize_term( $term, $taxonomy, $context = 'display' ) { * @param string $field Term field to sanitize. * @param string $value Search for this term value. * @param int $term_id Term ID. - * @param string $taxonomy Taxonomy Name. + * @param string $taxonomy Taxonomy name. * @param string $context Context in which to sanitize the term field. * Accepts 'raw', 'edit', 'db', 'display', 'rss', * 'attribute', or 'js'. Default 'display'. @@ -1909,8 +1909,8 @@ function wp_count_terms( $args = array(), $deprecated = '' ) { * * @since 2.3.0 * - * @param int $object_id The term Object Id that refers to the term. - * @param string|array $taxonomies List of Taxonomy Names or single Taxonomy name. + * @param int $object_id The term object ID that refers to the term. + * @param string|array $taxonomies List of taxonomy names or single taxonomy name. */ function wp_delete_object_term_relationships( $object_id, $taxonomies ) { $object_id = (int) $object_id; @@ -1939,7 +1939,7 @@ function wp_delete_object_term_relationships( $object_id, $taxonomies ) { * @global wpdb $wpdb WordPress database abstraction object. * * @param int $term Term ID. - * @param string $taxonomy Taxonomy Name. + * @param string $taxonomy Taxonomy name. * @param array|string $args { * Optional. Array of arguments to override the default term ID. Default empty array. * @@ -2005,7 +2005,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) { * @since 4.1.0 * * @param int $term Term ID. - * @param string $taxonomy Taxonomy Name. + * @param string $taxonomy Taxonomy name. */ do_action( 'pre_delete_term', $term, $taxonomy ); diff --git a/wp-includes/version.php b/wp-includes/version.php index d9c1e9058c..b300a759f5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-beta2-52356'; +$wp_version = '5.9-beta2-52357'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.