Index: src/wp-admin/includes/class-wp-ms-sites-list-table.php
===================================================================
--- src/wp-admin/includes/class-wp-ms-sites-list-table.php (revision 32624)
+++ src/wp-admin/includes/class-wp-ms-sites-list-table.php (working copy)
@@ -214,7 +214,7 @@
$blog_states = array();
foreach ( $status_list as $status => $col ) {
- if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
+ if ( $blog[ $status ] == 1 ) {
$class = " class='{$col[0]}'";
$blog_states[] = $col[1];
}
@@ -283,23 +283,27 @@
$actions['edit'] = '' . __( 'Edit' ) . '';
$actions['backend'] = "" . __( 'Dashboard' ) . '';
if ( get_current_site()->blog_id != $blog['blog_id'] ) {
- if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
- $actions['activate'] = '' . __( 'Activate' ) . '';
- else
- $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
+ if ( $blog['deleted'] == '1' ) {
+ $actions['activate'] = '' . __( 'Activate' ) . '';
+ } else {
+ $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
+ }
- if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
- $actions['unarchive'] = '' . __( 'Unarchive' ) . '';
- else
- $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . '';
+ if ( $blog['archived'] == '1' ) {
+ $actions['unarchive'] = '' . __( 'Unarchive' ) . '';
+ } else {
+ $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . '';
+ }
- if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
- $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . '';
- else
- $actions['spam'] = '' . _x( 'Spam', 'site' ) . '';
+ if ( $blog['spam'] == '1' ) {
+ $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . '';
+ } else {
+ $actions['spam'] = '' . _x( 'Spam', 'site' ) . '';
+ }
- if ( current_user_can( 'delete_site', $blog['blog_id'] ) )
- $actions['delete'] = '' . __( 'Delete' ) . '';
+ if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
+ $actions['delete'] = '' . __( 'Delete' ) . '';
+ }
}
$actions['visit'] = "" . __( 'Visit' ) . '';
Index: src/wp-admin/includes/class-wp-ms-users-list-table.php
===================================================================
--- src/wp-admin/includes/class-wp-ms-users-list-table.php (revision 32624)
+++ src/wp-admin/includes/class-wp-ms-users-list-table.php (working copy)
@@ -252,14 +252,18 @@
$actions['edit'] = '' . __( 'Edit' ) . '';
$class = '';
- if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
+ if ( $val->spam == 1 ) {
$class .= 'site-spammed ';
- if ( get_blog_status( $val->userblog_id, 'mature' ) == 1 )
+ }
+ if ( $val->mature == 1 ) {
$class .= 'site-mature ';
- if ( get_blog_status( $val->userblog_id, 'deleted' ) == 1 )
+ }
+ if ( $val->deleted == 1 ) {
$class .= 'site-deleted ';
- if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 )
+ }
+ if ( $val->archived == 1 ) {
$class .= 'site-archived ';
+ }
$actions['view'] = '' . __( 'View' ) . '';
Index: src/wp-includes/user.php
===================================================================
--- src/wp-includes/user.php (revision 32626)
+++ src/wp-includes/user.php (working copy)
@@ -1176,6 +1176,7 @@
'site_id' => $blog->site_id,
'siteurl' => $blog->siteurl,
'archived' => $blog->archived,
+ 'mature' => $blog->mature,
'spam' => $blog->spam,
'deleted' => $blog->deleted,
);
@@ -1205,6 +1206,7 @@
'site_id' => $blog->site_id,
'siteurl' => $blog->siteurl,
'archived' => $blog->archived,
+ 'mature' => $blog->mature,
'spam' => $blog->spam,
'deleted' => $blog->deleted,
);