WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix problems with hidden columns on network users screen. Props ocean90. See #14579 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-11-28 17:39:44 +00:00
parent b1e7c513b7
commit cc540d502a
3 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,12 +310,12 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
break;
case 'plugins': ?>
<?php if ( has_filter( 'wpmublogsaction' ) ) {
echo "<td valign='top'class='$column_name column-$column_name'$style>";
do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
</td>
<?php } ?>
<?php break;
<?php if ( has_filter( 'wpmublogsaction' ) ) {
echo "<td valign='top' class='$column_name column-$column_name'$style>";
do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
</td>
<?php }
break;
default:
echo "<td class='$column_name column-$column_name'$style>";

2
wp-admin/includes/class-wp-ms-themes-list-table.php
View File

@ -334,7 +334,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
echo "</div></td>";
break;
break;
default:
echo "<td class='$column_name column-$column_name'$style>";
do_action( 'manage_themes_custom_column', $column_name, $theme_key, $theme );

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

@ -17,7 +17,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
}
function prepare_items() {
global $usersearch, $role, $wpdb;
global $usersearch, $role, $wpdb, $mode;
$usersearch = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
@ -55,6 +55,8 @@ class WP_MS_Users_List_Table extends WP_List_Table {
if ( isset( $_REQUEST['order'] ) )
$args['order'] = $_REQUEST['order'];
$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
// Query the user IDs for this page
$wp_user_search = new WP_User_Query( $args );
@ -109,7 +111,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
function get_columns() {
$users_columns = array(
'cb' => '<input type="checkbox" />',
'login' => __( 'Username' ),
'username' => __( 'Username' ),
'name' => __( 'Name' ),
'email' => __( 'E-mail' ),
'registered' => _x( 'Registered', 'user' ),
@ -122,7 +124,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
function get_sortable_columns() {
return array(
'login' => 'login',
'username' => 'login',
'name' => 'name',
'email' => 'email',
'registered' => 'id',
@ -132,10 +134,10 @@ class WP_MS_Users_List_Table extends WP_List_Table {
function display_rows() {
global $current_site, $mode;
$class = '';
$alt = '';
$super_admins = get_super_admins();
foreach ( $this->items as $user ) {
$class = ( 'alternate' == $class ) ? '' : 'alternate';
$alt = ( 'alternate' == $alt ) ? '' : 'alternate';
$status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
@ -145,17 +147,20 @@ class WP_MS_Users_List_Table extends WP_List_Table {
}
?>
<tr class="<?php echo $class; ?>">
<tr class="<?php echo $alt; ?>">
<?php
list( $columns, $hidden ) = $this->get_column_info();
foreach ( $columns as $column_name => $column_display_name ) :
$class = "class='$column_name column-$column_name'";
$style = '';
if ( in_array( $column_name, $hidden ) )
$style = ' style="display:none;"';
$attributes = "$class$style";
switch ( $column_name ) {
case 'cb': ?>
@ -165,18 +170,11 @@ class WP_MS_Users_List_Table extends WP_List_Table {
<?php
break;
case 'id': ?>
<th valign="top" scope="row">
<?php echo $user->ID ?>
</th>
<?php
break;
case 'login':
case 'username':
$avatar = get_avatar( $user->user_email, 32 );
$edit_link = ( get_current_user_id() == $user->ID ) ? 'profile.php' : 'user-edit.php?user_id=' . $user->ID;
?>
<td class="username column-username">
echo "<td $attributes>"; ?>
<?php echo $avatar; ?><strong><a href="<?php echo esc_url( self_admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user->user_login ); ?></a><?php
if ( in_array( $user->user_login, $super_admins ) )
echo ' - ' . __( 'Super Admin' );
@ -197,14 +195,12 @@ class WP_MS_Users_List_Table extends WP_List_Table {
<?php
break;
case 'name': ?>
<td class="name column-name"><?php echo "$user->first_name $user->last_name"; ?></td>
<?php
case 'name':
echo "<td $attributes>$user->first_name $user->last_name</td>";
break;
case 'email': ?>
<td class="email column-email"><a href="mailto:<?php echo $user->user_email ?>"><?php echo $user->user_email ?></a></td>
<?php
case 'email':
echo "<td $attributes><a href='mailto:$user->user_email'>$user->user_email</a></td>";
break;
case 'registered':
@ -212,16 +208,13 @@ class WP_MS_Users_List_Table extends WP_List_Table {
$date = 'Y/m/d';
else
$date = 'Y/m/d \<\b\r \/\> g:i:s a';
?>
<td><?php echo mysql2date( $date, $user->user_registered ); ?></td>
<?php
echo "<td $attributes>" . mysql2date( $date, $user->user_registered ) . "</td>";
break;
case 'blogs':
$blogs = get_blogs_of_user( $user->ID, true );
?>
<td>
<?php
echo "<td $attributes>";
if ( is_array( $blogs ) ) {
foreach ( (array) $blogs as $key => $val ) {
$path = ( $val->path == '/' ) ? '' : $val->path;
@ -245,9 +238,10 @@ class WP_MS_Users_List_Table extends WP_List_Table {
<?php
break;
default: ?>
<td><?php echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID ); ?></td>
<?php
default:
echo "<td $attributes>";
echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID );
echo "</td>";
break;
}
endforeach