Changeset 16126

Timestamp:

11/01/2010 08:43:24 AM (14 years ago)

Author:

westi

Message:

Correct the subdomain/non-subdomain logic when listing sites.
Tidy up the case statement.
See #15174.

File:

• trunk/wp-admin/includes/list-table-sites.php (modified) (4 diffs)

trunk/wp-admin/includes/list-table-sites.php

@@ -159 +159 @@
             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();
 
@@ -245 +245 @@
                         ?>
                         </td>
-                <?php
-                break;
-                    case 'users': ?>
+                    <?php
+                    break;
+                case 'users': ?>
                         <td valign="top">
                             <?php
@@ -271 +271 @@
                     break;
 
-                    case 'plugins': ?>
+                case 'plugins': ?>
                         <?php if ( has_filter( 'wpmublogsaction' ) ) { ?>
                         <td valign="top">
@@ -279 +279 @@
                     <?php break;
 
-                    default: ?>
+                default: ?>
                         <?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?>
                         <td valign="top">