<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16126] trunk/wp-admin/includes/list-table-sites.php: Correct the subdomain
/non-subdomain logic when listing sites.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16126">16126</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-11-01 08:43:24 +0000 (Mon, 01 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct the subdomain/non-subdomain logic when listing sites.
Tidy up the case statement.
See <a href="http://trac.wordpress.org/ticket/15174">#15174</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeslisttablesitesphp">trunk/wp-admin/includes/list-table-sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludeslisttablesitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-sites.php (16125 => 16126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-sites.php 2010-11-01 08:37:02 UTC (rev 16125)
+++ trunk/wp-admin/includes/list-table-sites.php 2010-11-01 08:43:24 UTC (rev 16126)
</span><span class="lines">@@ -158,8 +158,8 @@
</span><span class="cx"> }
</span><span class="cx"> echo "<tr class='$class'>";
</span><span class="cx">
</span><del>- $blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
-
</del><ins>+ $blogname = ( is_subdomain_install() ) ? $blog['path'] : str_replace( '.'.$current_site->domain, '', $blog['domain'] );
+
</ins><span class="cx"> list( $columns, $hidden ) = $this->get_column_info();
</span><span class="cx">
</span><span class="cx"> foreach ( $columns as $column_name => $column_display_name ) {
</span><span class="lines">@@ -244,9 +244,9 @@
</span><span class="cx"> echo mysql2date( $date, $blog['registered'] );
</span><span class="cx"> ?>
</span><span class="cx"> </td>
</span><del>- <?php
- break;
- case 'users': ?>
</del><ins>+ <?php
+ break;
+ case 'users': ?>
</ins><span class="cx"> <td valign="top">
</span><span class="cx"> <?php
</span><span class="cx"> $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case 'plugins': ?>
</del><ins>+ case 'plugins': ?>
</ins><span class="cx"> <?php if ( has_filter( 'wpmublogsaction' ) ) { ?>
</span><span class="cx"> <td valign="top">
</span><span class="cx"> <?php do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <?php break;
</span><span class="cx">
</span><del>- default: ?>
</del><ins>+ default: ?>
</ins><span class="cx"> <?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?>
</span><span class="cx"> <td valign="top">
</span><span class="cx"> <?php do_action( 'manage_blogs_custom_column', $column_name, $blog['blog_id'] ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>