From 4ca40b65ec608ab6d4b63fc8fb4a6970dd6eefe8 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Thu, 4 Aug 2016 22:56:41 +0000 Subject: [PATCH] Docs: Correct and clarify various `@since` docs. Fixes #37562 Merges [38201] to the 4.6 branch. Built from https://develop.svn.wordpress.org/branches/4.6@38202 git-svn-id: http://core.svn.wordpress.org/branches/4.6@38143 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-ms-sites-list-table.php | 1 - wp-includes/class-wp-customize-setting.php | 2 +- wp-includes/ms-functions.php | 3 --- wp-includes/ms-load.php | 8 ++++---- wp-includes/post.php | 5 ++--- wp-includes/version.php | 2 +- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php index 290157fec2..9ce3ffee9b 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -62,7 +62,6 @@ class WP_MS_Sites_List_Table extends WP_List_Table { * Prepares the list of sites for display. * * @since 3.1.0 - * @since 4.6.0 Converted to use get_sites() * * @global string $s * @global string $mode diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php index a332594111..a0d04d383b 100644 --- a/wp-includes/class-wp-customize-setting.php +++ b/wp-includes/class-wp-customize-setting.php @@ -468,7 +468,7 @@ class WP_Customize_Setting { * the value of the setting. * * @since 3.4.0 - * @since 4.6.0 Return the result of updating the value. + * * @access public * * @return false|void False if cap check fails or value isn't set or is invalid. diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index bf34bc3e99..a253a61dac 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -296,7 +296,6 @@ function get_blog_permalink( $blog_id, $post_id ) { * $domain is 'blog1.example.com' and $path is '/'. * * @since MU 2.6.5 - * @since 4.6.0 Converted to use get_sites() * * @global wpdb $wpdb WordPress database abstraction object. * @@ -1252,7 +1251,6 @@ Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['RE * that each blogname is unique. * * @since MU - * @since 4.6.0 Converted to use get_sites() * * @global wpdb $wpdb WordPress database abstraction object. * @@ -2259,7 +2257,6 @@ function wp_maybe_update_network_user_counts() { * Update the network-wide site count. * * @since 3.7.0 - * @since 4.6.0 Converted to use get_sites() * * @global wpdb $wpdb WordPress database abstraction object. */ diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 5e8ea9536a..9fbaa5fa0d 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -121,7 +121,8 @@ function ms_site_check() { * Retrieve the closest matching network for a domain and path. * * @since 3.9.0 - * @since 4.4.0 Converted to a wrapper for WP_Network::get_by_path() + * + * @internal In 4.4.0, converted to a wrapper for WP_Network::get_by_path() * * @param string $domain Domain to check. * @param string $path Path to check. @@ -136,8 +137,8 @@ function get_network_by_path( $domain, $path, $segments = null ) { * Retrieve an object containing information about the requested network. * * @since 3.9.0 - * @since 4.4.0 Converted to leverage WP_Network - * @since 4.6.0 Converted to use get_network() + * + * @internal In 4.6.0, converted to use get_network() * * @param object|int $network The network's database row or ID. * @return WP_Network|false Object containing network information if found, false if not. @@ -155,7 +156,6 @@ function wp_get_network( $network ) { * Retrieve a site object by its domain and path. * * @since 3.9.0 - * @since 4.6.0 Converted to use get_sites() * * @global wpdb $wpdb WordPress database abstraction object. * diff --git a/wp-includes/post.php b/wp-includes/post.php index f5cfd0c32f..9bc645f4d4 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -837,7 +837,7 @@ function get_post_type( $post = null ) { * Retrieves a post type object by name. * * @since 3.0.0 - * @since 4.6.0 Converted to use WP_Post_Type. + * @since 4.6.0 Object returned is now an instance of WP_Post_Type. * * @global array $wp_post_types List of post types. * @@ -900,7 +900,7 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) * @since 3.0.0 The `show_ui` argument is now enforced on the new post screen. * @since 4.4.0 The `show_ui` argument is now enforced on the post type listing * screen and post editing screen. - * @since 4.6.0 Converted to use WP_Post_Type. + * @since 4.6.0 Post type object returned is now an instance of WP_Post_Type. * * @global array $wp_post_types List of post types. * @@ -1058,7 +1058,6 @@ function register_post_type( $post_type, $args = array() ) { * Can not be used to unregister built-in post types. * * @since 4.5.0 - * @since 4.6.0 Converted to use WP_Post_Type. * * @global array $wp_post_types List of post types. * diff --git a/wp-includes/version.php b/wp-includes/version.php index ed3d91ece4..c4a4fe5630 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-RC1-38200'; +$wp_version = '4.6-RC1-38202'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.