From 9afeafeff2813f45519d3a2aff68d39a08088f76 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Fri, 17 Jun 2016 16:06:31 +0000 Subject: [PATCH] Docs: Add a missing summary and `@since` version to the DocBlock for `WP_MS_Sites_List_Table::prepare_items()`. Also adds a changelog entry for 4.6.0 noting the changeover to `get_sites()`. Fixes #36675. See #21837, #24833 and #33185. Built from https://develop.svn.wordpress.org/trunk@37739 git-svn-id: http://core.svn.wordpress.org/trunk@37704 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-ms-sites-list-table.php | 4 ++++ wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 4bee788ebf..6ffc312906 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -59,6 +59,10 @@ 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/version.php b/wp-includes/version.php index abb4661760..f6149db25b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37738'; +$wp_version = '4.6-alpha-37739'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.