<!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" />
<title>[32755] trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php: In `WP_MS_Sites_List_Table::display_rows()`:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32755">32755</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32755","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-13 16:23:01 +0000 (Sat, 13 Jun 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>In `WP_MS_Sites_List_Table::display_rows()`:
* Move the giant `switch` statement into methods
* Call `->single_row_columns()`, which we now override - it could inherit from `WP_List_Table` if we can find a way to handle the `id` column. When that happens, we can ditch this method.
See <a href="https://core.trac.wordpress.org/ticket/29881">#29881</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2015-06-13 15:56:13 UTC (rev 32754)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2015-06-13 16:23:01 UTC (rev 32755)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_MS_Sites_List_Table extends WP_List_Table {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.3.0
+ *
+ * @var array
+ */
+ public $status_list;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,6 +27,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An associative array of arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $args = array() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->status_list = array(
+ 'archived' => array( 'site-archived', __( 'Archived' ) ),
+ 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ),
+ 'deleted' => array( 'site-deleted', __( 'Deleted' ) ),
+ 'mature' => array( 'site-mature', __( 'Mature' ) )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'plural' => 'sites',
</span><span class="cx" style="display: block; padding: 0 10px"> 'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +193,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +220,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,158 +231,238 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.3.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $blog
+ */
+ public function column_cb( $blog ) {
+ if ( ! is_main_site( $blog['blog_id'] ) ) :
+ $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+ ?>
+ <label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php
+ printf( __( 'Select %s' ), $blogname );
+ ?></label>
+ <input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
+ <?php endif;
+ }
+
+ /**
+ * @since 4.3.0
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global string $mode
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param array $blog
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function display_rows() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function column_blogname( $blog ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_list = array(
- 'archived' => array( 'site-archived', __( 'Archived' ) ),
- 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ),
- 'deleted' => array( 'site-deleted', __( 'Deleted' ) ),
- 'mature' => array( 'site-mature', __( 'Mature' ) )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+ $blog_states = array();
+ reset( $this->status_list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->status_list as $status => $col ) {
+ if ( $blog[ $status ] == 1 ) {
+ $blog_states[] = $col[1];
+ }
+ }
+ $blog_state = '';
+ if ( ! empty( $blog_states ) ) {
+ $state_count = count( $blog_states );
+ $i = 0;
+ $blog_state .= ' - ';
+ foreach ( $blog_states as $state ) {
+ ++$i;
+ $sep = ( $i == $state_count ) ? '' : ', ';
+ $blog_state .= "<span class='post-state'>$state$sep</span>";
+ }
+ }
+
+ ?>
+ <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
+ <?php
+ if ( 'list' !== $mode ) {
+ switch_to_blog( $blog['blog_id'] );
+ /* translators: 1: site name, 2: site tagline. */
+ echo '<p>' . sprintf( __( '%1$s – <em>%2$s</em>' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '</p>';
+ restore_current_blog();
+ }
+ }
+
+ /**
+ * @since 4.3.0
+ *
+ * @param array $blog
+ */
+ public function column_lastupdated( $blog ) {
+ global $mode;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'list' == $mode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d g:i:s a' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $this->items as $blog ) {
- $class = '';
- reset( $status_list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_states = array();
- foreach ( $status_list as $status => $col ) {
- if ( $blog[ $status ] == 1 ) {
- $class = " class='{$col[0]}'";
- $blog_states[] = $col[1];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @since 4.3.0
+ *
+ * @param array $blog
+ */
+ public function column_registered( $blog ) {
+ global $mode;
+
+ if ( 'list' == $mode ) {
+ $date = __( 'Y/m/d' );
+ } else {
+ $date = __( 'Y/m/d g:i:s a' );
+ }
+
+ if ( $blog['registered'] == '0000-00-00 00:00:00' ) {
+ echo '—';
+ } else {
+ echo mysql2date( $date, $blog['registered'] );
+ }
+ }
+
+ /**
+ * @since 4.3.0
+ *
+ * @param array $blog
+ */
+ public function column_users( $blog ) {
+ $user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
+ if ( ! $user_count ) {
+ $blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
+ $user_count = count( $blog_users );
+ unset( $blog_users );
+ wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+ }
+
+ printf(
+ '<a href="%s">%s</a>',
+ esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
+ number_format_i18n( $user_count )
+ );
+ }
+
+ /**
+ * @since 4.3.0
+ *
+ * @param array $blog
+ */
+ public function column_plugins( $blog ) {
+ if ( has_filter( 'wpmublogsaction' ) ) {
+ /**
+ * Fires inside the auxiliary 'Actions' column of the Sites list table.
+ *
+ * By default this column is hidden unless something is hooked to the action.
+ *
+ * @since MU
+ *
+ * @param int $blog_id The site ID.
+ */
+ do_action( 'wpmublogsaction', $blog['blog_id'] );
+ }
+ }
+
+ /**
+ * @since 4.3.0
+ *
+ * @param array $blog
+ * @param string $column_name
+ */
+ public function column_default( $blog, $column_name ) {
+ /**
+ * Fires for each registered custom column in the Sites list table.
+ *
+ * @since 3.1.0
+ *
+ * @param string $column_name The name of the column to display.
+ * @param int $blog_id The site ID.
+ */
+ do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
+ }
+
+ /**
+ * @since 4.3.0
+ *
+ * @param array $item
+ */
+ public function single_row_columns( $item ) {
+ list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+
+ foreach ( $columns as $column_name => $column_display_name ) {
+ $classes = "$column_name column-$column_name";
+ if ( $primary === $column_name ) {
+ $classes .= ' has-row-actions column-primary';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_state = '';
- if ( ! empty( $blog_states ) ) {
- $state_count = count( $blog_states );
- $i = 0;
- $blog_state .= ' - ';
- foreach ( $blog_states as $state ) {
- ++$i;
- ( $i == $state_count ) ? $sep = '' : $sep = ', ';
- $blog_state .= "<span class='post-state'>$state$sep</span>";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( in_array( $column_name, $hidden ) ) {
+ $classes .= ' hidden';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<tr{$class}>";
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attributes = "class='$classes'";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cb' === $column_name ) {
+ echo '<th scope="row" class="check-column">';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $columns as $column_name => $column_display_name ) {
- $classes = "$column_name column-$column_name";
- if ( $primary === $column_name ) {
- $classes .= ' has-row-actions column-primary';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->column_cb( $item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $column_name, $hidden ) ) {
- $classes .= ' hidden';
- }
-
- $attributes = "class='$classes'";
-
- if ( 'cb' === $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '</th>';
+ } elseif ( 'id' === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row" class="check-column">
- <?php if ( ! is_main_site( $blog['blog_id'] ) ) : ?>
- <label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php printf( __( 'Select %s' ), $blogname ); ?></label>
- <input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
- <?php endif; ?>
- </th>
-<?php
- } elseif ( 'id' === $column_name ) {
-?>
</del><span class="cx" style="display: block; padding: 0 10px"> <th scope="row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo $blog['blog_id'] ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo $item['blog_id'] ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- echo "<td $attributes>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+ echo "<td $attributes>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( $column_name ) {
- case 'blogname':
- ?>
- <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
- <?php
- if ( 'list' != $mode ) {
- switch_to_blog( $blog['blog_id'] );
- /* translators: 1: site name, 2: site tagline. */
- echo '<p>' . sprintf( __( '%1$s – <em>%2$s</em>' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '</p>';
- restore_current_blog();
- }
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo call_user_func( array( $this, 'column_' . $column_name ), $item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'lastupdated':
- echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $this->handle_row_actions( $item, $column_name, $primary );
+ echo "</td>";
+ } else {
+ echo "<td $attributes>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'registered':
- if ( $blog['registered'] == '0000-00-00 00:00:00' ) {
- echo '—';
- } else {
- echo mysql2date( $date, $blog['registered'] );
- }
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $this->column_default( $item, $column_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'users':
- if ( ! $user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' ) ) {
- $blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
- $user_count = count( $blog_users );
- unset( $blog_users );
- wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $this->handle_row_actions( $item, $column_name, $primary );
+ echo "</td>";
+ }
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- '<a href="%s">%s</a>',
- esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
- number_format_i18n( $user_count )
- );
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @global string $mode
+ */
+ public function display_rows() {
+ global $mode;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'plugins':
- if ( has_filter( 'wpmublogsaction' ) ) {
- /**
- * Fires inside the auxiliary 'Actions' column of the Sites list table.
- *
- * By default this column is hidden unless something is hooked to the action.
- *
- * @since MU
- *
- * @param int $blog_id The site ID.
- */
- do_action( 'wpmublogsaction', $blog['blog_id'] );
- }
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' == $mode ) {
+ $date = __( 'Y/m/d' );
+ } else {
+ $date = __( 'Y/m/d g:i:s a' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- default:
- /**
- * Fires for each registered custom column in the Sites list table.
- *
- * @since 3.1.0
- *
- * @param string $column_name The name of the column to display.
- * @param int $blog_id The site ID.
- */
- do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->items as $blog ) {
+ $class = '';
+ reset( $this->status_list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $this->handle_row_actions( $blog, $column_name, $primary );
- echo '</td>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->status_list as $status => $col ) {
+ if ( $blog[ $status ] == 1 ) {
+ $class = " class='{$col[0]}'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- </tr>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ echo "<tr{$class}>";
+
+ $this->single_row_columns( $blog );
+
+ echo '</tr>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>