Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix formatting and add missing return descriptions for inline documentation introduced in [32644] for WP_MS_Sites_List_Table.

Browse Source 
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
This commit is contained in:
Drew Jaynes 2015-05-31 01:34:25 +00:00
parent 42afe1d373
commit 88569734d8
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/includes/class-wp-ms-sites-list-table.php
View File

@ -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;

2
wp-includes/version.php
View File

@ -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.