From 88569734d844e8319b1fb853cb9b45cee35f16ac Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Sun, 31 May 2015 01:34:25 +0000 Subject: [PATCH] Fix formatting and add missing return descriptions for inline documentation introduced in [32644] for `WP_MS_Sites_List_Table`. See #25408. See #32246. Built from https://develop.svn.wordpress.org/trunk@32664 git-svn-id: http://core.svn.wordpress.org/trunk@32634 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-wp-ms-sites-list-table.php | 15 +++++++-------- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 9 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 6c585e3b8a..efd087d73b 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -379,28 +379,27 @@ class WP_MS_Sites_List_Table extends WP_List_Table { } /** - * Get name of default primary column + * Get the name of the default primary column. * * @since 4.3.0 * @access protected * - * @return string + * @return string Name of the default primary column, in this case, 'blogname'. */ protected function get_default_primary_column_name() { return 'blogname'; } /** - * Generate and display row actions links + * Generate and display row actions links. * * @since 4.3.0 * @access protected * - * @param object $blog Blog being acted upon - * @param string $column_name Current column name - * @param string $primary Primary column name - * - * @return string + * @param object $blog Blog being acted upon. + * @param string $column_name Current column name. + * @param string $primary Primary column name. + * @return string Row actions output. */ protected function handle_row_actions( $blog, $column_name, $primary ) { global $current_site; diff --git a/wp-includes/version.php b/wp-includes/version.php index 31abfbbde8..7ab099f9f6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32663'; +$wp_version = '4.3-alpha-32664'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.