From 137357b76928fc00538f9ac27133667690736cab Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 13 Jul 2015 21:57:24 +0000 Subject: [PATCH] Fix formatting in the DocBlock for `_split_shared_term()`. See #32246. See #32891. Built from https://develop.svn.wordpress.org/trunk@33238 git-svn-id: http://core.svn.wordpress.org/trunk@33210 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/taxonomy.php | 7 +++++-- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 6d1888fe68..c2d0acc307 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -3364,6 +3364,7 @@ function wp_unique_term_slug( $slug, $term ) { } // If we didn't get a unique slug, try appending a number to make it unique. + /** * Filter whether the proposed unique term slug is bad. * @@ -4213,11 +4214,13 @@ function _update_generic_term_count( $terms, $taxonomy ) { } /** - * Create a new term for a term_taxonomy item that currently shares its term with another term_taxonomy. + * Create a new term for a term_taxonomy item that currently shares its term + * with another term_taxonomy. * * @ignore * @since 4.2.0 - * @since 4.3.0 Introduced `$record` parameter. `$term_id` and `$term_taxonomy_id` can now accept objects. + * @since 4.3.0 Introduced `$record` parameter. Also, `$term_id` and + * `$term_taxonomy_id` can now accept objects. * * @global wpdb $wpdb * diff --git a/wp-includes/version.php b/wp-includes/version.php index 69cb212d23..469363e6e0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-beta2-33237'; +$wp_version = '4.3-beta2-33238'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.