From 19d36bfdd2e2033ee282ab17da60c5f45a2eb794 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 20 Apr 2023 14:30:19 +0000
Subject: [PATCH] =?UTF-8?q?Networks=20and=20Sites:=20Simplify=20the=20chec?=
 =?UTF-8?q?k=20for=20main=20site=20on=20Network=20Admin=20=E2=86=92=20Site?=
 =?UTF-8?q?s=20screen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This replaces a site ID comparison when displaying action links in `WP_MS_Sites_List_Table::handle_row_actions()` with a dedicated function call, `is_main_site()`, for clarity.

Follow-up to [13918], [25125], [26120], [32644], [38814].

Props ecorica, spacedmonkey, SergeyBiryukov.
Fixes #58150.
Built from https://develop.svn.wordpress.org/trunk@55666


git-svn-id: http://core.svn.wordpress.org/trunk@55178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-ms-sites-list-table.php | 2 +-
 wp-includes/version.php                            | 2 +-
 2 files changed, 2 insertions(+), 2 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 aecf504342..8984793e5c 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -732,7 +732,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			__( 'Dashboard' )
 		);
 
-		if ( get_network()->site_id !== (int) $blog['blog_id'] ) {
+		if ( ! is_main_site( $blog['blog_id'] ) ) {
 			if ( '1' === $blog['deleted'] ) {
 				$actions['activate'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1f17dde8c9..3973b45076 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.3-alpha-55665';
+$wp_version = '6.3-alpha-55666';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.