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 3d4583f1ec..aecf504342 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -109,12 +109,17 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
if ( empty( $s ) ) {
// Nothing to do.
- } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
- preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
- preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
- preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+ } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s )
+ || preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s )
+ || preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s )
+ || preg_match( '/^[0-9]{1,3}\.$/', $s )
+ ) {
// IPv4 address.
- $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
+ $sql = $wpdb->prepare(
+ "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s",
+ $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' )
+ );
+
$reg_blog_ids = $wpdb->get_col( $sql );
if ( $reg_blog_ids ) {
@@ -262,7 +267,11 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
foreach ( $statuses as $status => $label_count ) {
if ( (int) $counts[ $status ] > 0 ) {
- $label = sprintf( translate_nooped_plural( $label_count, $counts[ $status ] ), number_format_i18n( $counts[ $status ] ) );
+ $label = sprintf(
+ translate_nooped_plural( $label_count, $counts[ $status ] ),
+ number_format_i18n( $counts[ $status ] )
+ );
+
$full_url = 'all' === $status ? $url : add_query_arg( 'status', $status, $url );
$view_links[ $status ] = array(
@@ -408,7 +417,8 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
printf( __( 'Select %s' ), $blogname );
?>
-
+
-
- site_states( $blog ); ?>
+ %2$s',
+ esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ),
+ $blogname
+ );
+
+ $this->site_states( $blog );
+ ?>
%s',
+ '%2$s',
esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
number_format_i18n( $user_count )
);
@@ -586,7 +607,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
reset( $this->status_list );
foreach ( $this->status_list as $status => $col ) {
- if ( 1 == $blog[ $status ] ) {
+ if ( '1' === $blog[ $status ] ) {
$class = " class='{$col[0]}'";
}
}
@@ -620,7 +641,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
$site_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
foreach ( $this->status_list as $status => $col ) {
- if ( ( 1 === (int) $_site->{$status} ) && ( $site_status !== $status ) ) {
+ if ( '1' === $_site->{$status} && $site_status !== $status ) {
$site_states[ $col[0] ] = $col[1];
}
}
@@ -699,33 +720,110 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
'visit' => '',
);
- $actions['edit'] = '' . __( 'Edit' ) . '';
- $actions['backend'] = "" . __( 'Dashboard' ) . '';
- if ( get_network()->site_id != $blog['blog_id'] ) {
- if ( '1' == $blog['deleted'] ) {
- $actions['activate'] = '' . __( 'Activate' ) . '';
+ $actions['edit'] = sprintf(
+ '%2$s',
+ esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ),
+ __( 'Edit' )
+ );
+
+ $actions['backend'] = sprintf(
+ '%2$s',
+ esc_url( get_admin_url( $blog['blog_id'] ) ),
+ __( 'Dashboard' )
+ );
+
+ if ( get_network()->site_id !== (int) $blog['blog_id'] ) {
+ if ( '1' === $blog['deleted'] ) {
+ $actions['activate'] = sprintf(
+ '%2$s',
+ esc_url(
+ wp_nonce_url(
+ network_admin_url( 'sites.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] ),
+ 'activateblog_' . $blog['blog_id']
+ )
+ ),
+ __( 'Activate' )
+ );
} else {
- $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
+ $actions['deactivate'] = sprintf(
+ '%2$s',
+ esc_url(
+ wp_nonce_url(
+ network_admin_url( 'sites.php?action=confirm&action2=deactivateblog&id=' . $blog['blog_id'] ),
+ 'deactivateblog_' . $blog['blog_id']
+ )
+ ),
+ __( 'Deactivate' )
+ );
}
- if ( '1' == $blog['archived'] ) {
- $actions['unarchive'] = '' . __( 'Unarchive' ) . '';
+ if ( '1' === $blog['archived'] ) {
+ $actions['unarchive'] = sprintf(
+ '%2$s',
+ esc_url(
+ wp_nonce_url(
+ network_admin_url( 'sites.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] ),
+ 'unarchiveblog_' . $blog['blog_id']
+ )
+ ),
+ __( 'Unarchive' )
+ );
} else {
- $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . '';
+ $actions['archive'] = sprintf(
+ '%2$s',
+ esc_url(
+ wp_nonce_url(
+ network_admin_url( 'sites.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] ),
+ 'archiveblog_' . $blog['blog_id']
+ )
+ ),
+ _x( 'Archive', 'verb; site' )
+ );
}
- if ( '1' == $blog['spam'] ) {
- $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . '';
+ if ( '1' === $blog['spam'] ) {
+ $actions['unspam'] = sprintf(
+ '%2$s',
+ esc_url(
+ wp_nonce_url(
+ network_admin_url( 'sites.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] ),
+ 'unspamblog_' . $blog['blog_id']
+ )
+ ),
+ _x( 'Not Spam', 'site' )
+ );
} else {
- $actions['spam'] = '' . _x( 'Spam', 'site' ) . '';
+ $actions['spam'] = sprintf(
+ '%2$s',
+ esc_url(
+ wp_nonce_url(
+ network_admin_url( 'sites.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] ),
+ 'spamblog_' . $blog['blog_id']
+ )
+ ),
+ _x( 'Spam', 'site' )
+ );
}
if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
- $actions['delete'] = '' . __( 'Delete' ) . '';
+ $actions['delete'] = sprintf(
+ '%2$s',
+ esc_url(
+ wp_nonce_url(
+ network_admin_url( 'sites.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] ),
+ 'deleteblog_' . $blog['blog_id']
+ )
+ ),
+ __( 'Delete' )
+ );
}
}
- $actions['visit'] = "" . __( 'Visit' ) . '';
+ $actions['visit'] = sprintf(
+ '%2$s',
+ esc_url( get_home_url( $blog['blog_id'], '/' ) ),
+ __( 'Visit' )
+ );
/**
* Filters the action links displayed for each site in the Sites list table.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1cbc2169f7..953d7eae0d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '6.3-alpha-55655';
+$wp_version = '6.3-alpha-55656';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.