Changeset 32630

Timestamp:

05/27/2015 11:13:04 PM (9 years ago)

Author:

jeremyfelt

Message:

Use site objects rather than get_blog_status() in MS list tables.

Removes several repetitive calls to get_blog_status() that are not needed, as the data is already available as part of each site's object.

Fixes #32512.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-ms-sites-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -215 +215 @@
             $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];
@@ -284 +284 @@
                             $actions['backend'] = "<span class='backend'><a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a></span>';
                             if ( get_current_site()->blog_id != $blog['blog_id'] ) {
-                                if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
-                                    $actions['activate']    = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ), 'confirm' ) ) . '">' . __( 'Activate' ) . '</a></span>';
-                                else
-                                    $actions['deactivate']  = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Deactivate' ) . '</a></span>';
-
-                                if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
-                                    $actions['unarchive']   = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Unarchive' ) . '</a></span>';
-                                else
-                                    $actions['archive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
-
-                                if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
-                                    $actions['unspam']  = '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Not Spam', 'site' ) . '</a></span>';
-                                else
-                                    $actions['spam']    = '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Spam', 'site' ) . '</a></span>';
-
-                                if ( current_user_can( 'delete_site', $blog['blog_id'] ) )
-                                    $actions['delete']  = '<span class="delete"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Delete' ) . '</a></span>';
+                                if ( $blog['deleted'] == '1' ) {
+                                    $actions['activate']   = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ), 'confirm' ) ) . '">' . __( 'Activate' ) . '</a></span>';
+                                } else {
+                                    $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm' ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
+                                }
+
+                                if ( $blog['archived'] == '1' ) {
+                                    $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm' ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
+                                } else {
+                                    $actions['archive']   = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm' ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
+                                }
+
+                                if ( $blog['spam'] == '1' ) {
+                                    $actions['unspam'] = '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ), 'confirm' ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a></span>';
+                                } else {
+                                    $actions['spam']   = '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ), 'confirm' ) ) . '">' . _x( 'Spam', 'site' ) . '</a></span>';
+                                }
+
+                                if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
+                                    $actions['delete'] = '<span class="delete"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ), 'confirm' ) ) . '">' . __( 'Delete' ) . '</a></span>';
+                                }
                             }
 

trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -253 +253 @@
 
                                     $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'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';

trunk/src/wp-includes/user.php

@@ -1177 +1177 @@
                 'siteurl'     => $blog->siteurl,
                 'archived'    => $blog->archived,
+                'mature'      => $blog->mature,
                 'spam'        => $blog->spam,
                 'deleted'     => $blog->deleted,
@@ -1206 +1207 @@
                 'siteurl'     => $blog->siteurl,
                 'archived'    => $blog->archived,
+                'mature'      => $blog->mature,
                 'spam'        => $blog->spam,
                 'deleted'     => $blog->deleted,