From e496292ae5da6e3395aab65754f35e9f1e07ba6d Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 13 Nov 2010 20:47:34 +0000
Subject: [PATCH] Make manage_users_custom_column hook consistent between
 WP_(MS)?_Users_List_Table. Fixes #14562

git-svn-id: http://svn.automattic.com/wordpress/trunk@16354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-ms-users-list-table.php | 8 +++++++-
 wp-admin/includes/class-wp-users-list-table.php    | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index 683885866..7d2bb5ecd 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -159,6 +159,12 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 			list( $columns, $hidden ) = $this->get_column_info();
 
 			foreach ( $columns as $column_name => $column_display_name ) :
+				$style = '';
+				if ( in_array( $column_name, $hidden ) )
+					$style = ' style="display:none;"';
+
+				$attributes = "$class$style";
+
 				switch ( $column_name ) {
 					case 'cb': ?>
 						<th scope="row" class="check-column">
@@ -248,7 +254,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 					break;
 
 					default: ?>
-						<td><?php do_action( 'manage_users_custom_column', $column_name, $user->ID ); ?></td>
+						<td><?php echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID ); ?></td>
 					<?php
 					break;
 				}
diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 7afe03f94..5f8809afd 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -214,9 +214,10 @@ class WP_Users_List_Table extends WP_List_Table {
 			$edit = '<strong>' . $user_object->user_login . '</strong>';
 		}
 		$role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' );
-		$r = "<tr id='user-$user_object->ID'$style>";
 		$avatar = get_avatar( $user_object->ID, 32 );
 
+		$r = "<tr id='user-$user_object->ID'$style>";
+
 		list( $columns, $hidden ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {