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

Correct the subdomain/non-subdomain logic when listing sites. 

Tidy up the case statement.
See #15174.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-11-01 08:43:24 +00:00
parent a4d26eefc2
commit 034621a8d7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/list-table-sites.php
View File

@ -158,8 +158,8 @@ class WP_Sites_Table extends WP_List_Table {
} }
echo "<tr class='$class'>"; echo "<tr class='$class'>";
$blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path']; $blogname = ( is_subdomain_install() ) ? $blog['path'] : str_replace( '.'.$current_site->domain, '', $blog['domain'] );
list( $columns, $hidden ) = $this->get_column_info(); list( $columns, $hidden ) = $this->get_column_info();
foreach ( $columns as $column_name => $column_display_name ) { foreach ( $columns as $column_name => $column_display_name ) {
@ -244,9 +244,9 @@ class WP_Sites_Table extends WP_List_Table {
echo mysql2date( $date, $blog['registered'] ); echo mysql2date( $date, $blog['registered'] );
?> ?>
</td> </td>
<?php <?php
break; break;
case 'users': ?> case 'users': ?>
<td valign="top"> <td valign="top">
<?php <?php
$blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) ); $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
@ -270,7 +270,7 @@ class WP_Sites_Table extends WP_List_Table {
<?php <?php
break; break;
case 'plugins': ?> case 'plugins': ?>
<?php if ( has_filter( 'wpmublogsaction' ) ) { ?> <?php if ( has_filter( 'wpmublogsaction' ) ) { ?>
<td valign="top"> <td valign="top">
<?php do_action( 'wpmublogsaction', $blog['blog_id'] ); ?> <?php do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
@ -278,7 +278,7 @@ class WP_Sites_Table extends WP_List_Table {
<?php } ?> <?php } ?>
<?php break; <?php break;
default: ?> default: ?>
<?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?> <?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?>
<td valign="top"> <td valign="top">
<?php do_action( 'manage_blogs_custom_column', $column_name, $blog['blog_id'] ); ?> <?php do_action( 'manage_blogs_custom_column', $column_name, $blog['blog_id'] ); ?>