Changeset 54332

Timestamp:

09/27/2022 04:29:59 PM (23 months ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src/wp-includes

Files:

• capabilities.php (modified) (1 diff)
• load.php (modified) (4 diffs)

trunk/src/wp-includes/capabilities.php

@@ -1088 +1088 @@
  * 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.
- *
  * @since 3.0.0
  *

trunk/src/wp-includes/load.php

@@ -1158 +1158 @@
  * 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.
- *
  * Does not check if the user is an administrator; use current_user_can()
  * for checking roles and capabilities.
@@ -1199 +1184 @@
  * 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.
- *
  * e.g. `/wp-admin/`
  *
@@ -1240 +1210 @@
  * 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.
- *
- * e.g. `/wp-admin/network/`
- *
  * Does not check if the user is an administrator; use current_user_can()
  * for checking roles and capabilities.
@@ -1277 +1230 @@
 
     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();
 }