From 2bdcc71bc003f47f103819ca82a8ca7851ee385f Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 13 Jun 2015 16:23:25 +0000 Subject: [PATCH] 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 #29881. Built from https://develop.svn.wordpress.org/trunk@32755 git-svn-id: http://core.svn.wordpress.org/trunk@32726 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-wp-ms-sites-list-table.php | 356 +++++++++++------- wp-includes/version.php | 2 +- 2 files changed, 225 insertions(+), 133 deletions(-) diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php index 948decffdf..29e3e6e75a 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -9,6 +9,13 @@ */ class WP_MS_Sites_List_Table extends WP_List_Table { + /** + * @since 4.3.0 + * + * @var array + */ + public $status_list; + /** * Constructor. * @@ -20,6 +27,13 @@ class WP_MS_Sites_List_Table extends WP_List_Table { * @param array $args An associative array of arguments. */ public function __construct( $args = array() ) { + $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' ) ) + ); + parent::__construct( array( 'plural' => 'sites', 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, @@ -179,7 +193,6 @@ class WP_MS_Sites_List_Table extends WP_List_Table { } /** - * * @return array */ public function get_columns() { @@ -207,7 +220,6 @@ class WP_MS_Sites_List_Table extends WP_List_Table { } /** - * * @return array */ protected function get_sortable_columns() { @@ -218,6 +230,211 @@ class WP_MS_Sites_List_Table extends WP_List_Table { ); } + /** + * @since 4.3.0 + * + * @param array $blog + */ + public function column_cb( $blog ) { + if ( ! is_main_site( $blog['blog_id'] ) ) : + $blogname = untrailingslashit( $blog['domain'] . $blog['path'] ); + ?> + + + status_list ); + + 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 .= "$state$sep"; + } + } + + ?> + + ' . sprintf( __( '%1$s – %2$s' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '

'; + restore_current_blog(); + } + } + + /** + * @since 4.3.0 + * + * @param array $blog + */ + public function column_lastupdated( $blog ) { + global $mode; + + if ( 'list' == $mode ) { + $date = __( 'Y/m/d' ); + } else { + $date = __( 'Y/m/d g:i:s a' ); + } + + echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); + } + + /** + * @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( + '%s', + 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'; + } + + if ( in_array( $column_name, $hidden ) ) { + $classes .= ' hidden'; + } + + $attributes = "class='$classes'"; + + if ( 'cb' === $column_name ) { + echo ''; + + $this->column_cb( $item ); + + echo ''; + } elseif ( 'id' === $column_name ) { +?> + + + +"; + + echo call_user_func( array( $this, 'column_' . $column_name ), $item ); + + echo $this->handle_row_actions( $item, $column_name, $primary ); + echo ""; + } else { + echo ""; + + echo $this->column_default( $item, $column_name ); + + echo $this->handle_row_actions( $item, $column_name, $primary ); + echo ""; + } + } + } + /** * * @global string $mode @@ -225,13 +442,6 @@ class WP_MS_Sites_List_Table extends WP_List_Table { public function display_rows() { global $mode; - $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' ) ) - ); - if ( 'list' == $mode ) { $date = __( 'Y/m/d' ); } else { @@ -240,137 +450,19 @@ class WP_MS_Sites_List_Table extends WP_List_Table { foreach ( $this->items as $blog ) { $class = ''; - reset( $status_list ); + reset( $this->status_list ); - $blog_states = array(); - foreach ( $status_list as $status => $col ) { + foreach ( $this->status_list as $status => $col ) { if ( $blog[ $status ] == 1 ) { $class = " class='{$col[0]}'"; - $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; - ( $i == $state_count ) ? $sep = '' : $sep = ', '; - $blog_state .= "$state$sep"; } } + echo ""; - $blogname = untrailingslashit( $blog['domain'] . $blog['path'] ); + $this->single_row_columns( $blog ); - 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'; - } - - if ( in_array( $column_name, $hidden ) ) { - $classes .= ' hidden'; - } - - $attributes = "class='$classes'"; - - if ( 'cb' === $column_name ) { -?> - - - - - - - - - - -"; - - switch ( $column_name ) { - case 'blogname': - ?> - - ' . sprintf( __( '%1$s – %2$s' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '

'; - restore_current_blog(); - } - break; - - case 'lastupdated': - echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); - break; - - case 'registered': - if ( $blog['registered'] == '0000-00-00 00:00:00' ) { - echo '—'; - } else { - echo mysql2date( $date, $blog['registered'] ); - } - break; - - 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 ); - } - - printf( - '%s', - esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ), - number_format_i18n( $user_count ) - ); - break; - - 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; - - 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; - } - - echo $this->handle_row_actions( $blog, $column_name, $primary ); - echo ''; - } - } - ?> - - '; } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 46cc34b429..33d4517c8e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32754'; +$wp_version = '4.3-alpha-32755'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.