From cd0ae0eb85d40c967bb30d8ca49333ebbbf8ff58 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 27 Sep 2022 16:31:10 +0000
Subject: [PATCH] Bootstrap/Load: Revert the `is_*_admin_screen()` aliases for
 `is_*_admin()` function family.

After some further discussion, it is apparent that the added clarity was subjective, and the `_screen` suffix may not always be appropriate, e.g. in Ajax context. To address any confusion with the existing names, the documentation for these functions can be updated instead.

Additionally, the `is_super_admin_user()` alias for `is_super_admin()` is reverted as well, which may be reconsidered in the future.

Follow-up to [54259].

Props azaozz, jrf, johnbillion, manfcarlo, Clorith.
See #56400.
Built from https://develop.svn.wordpress.org/trunk@54332


git-svn-id: http://core.svn.wordpress.org/trunk@53891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/capabilities.php | 16 ---------
 wp-includes/load.php         | 64 ------------------------------------
 wp-includes/version.php      |  2 +-
 3 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 6c6b30575a..1e55d55f53 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1084,22 +1084,6 @@ function get_super_admins() {
 	}
 }
 
-/**
- * Determines whether user is a site admin.
- *
- * @since 6.1.0
- *
- * This function is an alias for is_super_admin().
- *
- * @see is_super_admin()
- *
- * @param int|false $user_id Optional. The ID of a user. Defaults to false, to check the current user.
- * @return bool Whether the user is a site admin.
- */
-function is_super_admin_user( $user_id = false ) {
-	return is_super_admin( $user_id );
-}
-
 /**
  * Determines whether user is a site admin.
  *
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 6ea81319fe..91ddc56d34 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -1154,21 +1154,6 @@ function is_login_screen() {
 	return false !== stripos( wp_login_url(), $_SERVER['SCRIPT_NAME'] );
 }
 
-/**
- * Determines whether the current request is for an administrative interface page.
- *
- * This function is an alias for is_admin().
- *
- * @since 6.1.0
- *
- * @see is_admin()
- *
- * @return bool True if inside WordPress administration interface, false otherwise.
- */
-function is_admin_screen() {
-	return is_admin();
-}
-
 /**
  * Determines whether the current request is for an administrative interface page.
  *
@@ -1195,21 +1180,6 @@ function is_admin() {
 	return false;
 }
 
-/**
- * Determines whether the current request is for a site's administrative interface.
- *
- * This function is an alias for is_blog_admin().
- *
- * @since 6.1.0
- *
- * @see is_blog_admin()
- *
- * @return bool True if inside WordPress site administration pages.
- */
-function is_site_admin_screen() {
-	return is_blog_admin();
-}
-
 /**
  * Determines whether the current request is for a site's administrative interface.
  *
@@ -1234,23 +1204,6 @@ function is_blog_admin() {
 	return false;
 }
 
-/**
- * Determines whether the current request is for the network administrative interface.
- *
- * e.g. `/wp-admin/network/`
- *
- * This function is an alias for is_network_admin().
- *
- * @since 6.1.0
- *
- * @see is_network_admin()
- *
- * @return bool True if inside WordPress network administration pages.
- */
-function is_network_admin_screen() {
-	return is_network_admin();
-}
-
 /**
  * Determines whether the current request is for the network administrative interface.
  *
@@ -1278,23 +1231,6 @@ function is_network_admin() {
 	return false;
 }
 
-/**
- * Determines whether the current request is for a user admin screen.
- *
- * e.g. `/wp-admin/user/`
- *
- * This function is an alias for is_user_admin().
- *
- * @since 6.1.0
- *
- * @see is_user_admin()
- *
- * @return bool True if inside WordPress user administration pages.
- */
-function is_user_admin_screen() {
-	return is_user_admin();
-}
-
 /**
  * Determines whether the current request is for a user admin screen.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ebcc5e7dce..64724224b9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-beta1-54331';
+$wp_version = '6.1-beta1-54332';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.