IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
See #25408. See #32246.

Built from https://develop.svn.wordpress.org/trunk@32666


git-svn-id: http://core.svn.wordpress.org/trunk@32636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-05-31 01:38:26 +00:00
parent 5e84c7004d
commit d7428fc35d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/includes/class-wp-ms-users-list-table.php
View File

@ -325,28 +325,27 @@ class WP_MS_Users_List_Table extends WP_List_Table {
} }
/** /**
* Get name of default primary column * Get the name of the default primary column.
* *
* @since 4.3.0 * @since 4.3.0
* @access protected * @access protected
* *
* @return string * @return string Name of the default primary column, in this case, 'username'.
*/ */
protected function get_default_primary_column_name() { protected function get_default_primary_column_name() {
return 'username'; return 'username';
} }
/** /**
* Generate and display row actions links * Generate and display row actions links.
* *
* @since 4.3.0 * @since 4.3.0
* @access protected * @access protected
* *
* @param object $user User being acted upon * @param object $user User being acted upon.
* @param string $column_name Current column name * @param string $column_name Current column name.
* @param string $primary Primary column name * @param string $primary Primary column name.
* * @return string Row actions output for users in Multisite.
* @return string
*/ */
protected function handle_row_actions( $user, $column_name, $primary ) { protected function handle_row_actions( $user, $column_name, $primary ) {
$super_admins = get_super_admins(); $super_admins = get_super_admins();
@ -361,8 +360,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
} }
/** /**
* Filter the action links displayed under each user * Filter the action links displayed under each user in the Network Admin Users list table.
* in the Network Admin Users list table.
* *
* @since 3.2.0 * @since 3.2.0
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32665'; $wp_version = '4.3-alpha-32666';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.