Changeset 21687 for trunk/wp-includes/load.php

Timestamp:

08/31/2012 05:16:46 PM (13 years ago)

Author:

ryan

Message:

Introduce WP_Screen::in_admin() for determining which admin the screen is in.
Change is_*_admin() to reference in_admin() with fallback to the WP_*_ADMIN constants during early bootstrap. This allows unit tests and ajax handlers to set the admin context.

fixes #21742

File:

• trunk/wp-includes/load.php (modified) (4 diffs)

trunk/wp-includes/load.php

@@ -584 +584 @@
  */
 function is_admin() {
-    if ( defined( 'WP_ADMIN' ) )
+    if ( isset( $GLOBALS['current_screen'] ) )
+        return $GLOBALS['current_screen']->in_admin();
+    elseif ( defined( 'WP_ADMIN' ) )
         return WP_ADMIN;
+
     return false;
 }
@@ -600 +603 @@
  */
 function is_blog_admin() {
-    if ( defined( 'WP_BLOG_ADMIN' ) )
+    if ( isset( $GLOBALS['current_screen'] ) )
+        return $GLOBALS['current_screen']->in_admin( 'blog' );
+    elseif ( defined( 'WP_BLOG_ADMIN' ) )
         return WP_BLOG_ADMIN;
+
     return false;
 }
@@ -616 +622 @@
  */
 function is_network_admin() {
-    if ( defined( 'WP_NETWORK_ADMIN' ) )
+    if ( isset( $GLOBALS['current_screen'] ) )
+        return $GLOBALS['current_screen']->in_admin( 'network' );
+    elseif ( defined( 'WP_NETWORK_ADMIN' ) )
         return WP_NETWORK_ADMIN;
+
     return false;
 }
@@ -632 +641 @@
  */
 function is_user_admin() {
-    if ( defined( 'WP_USER_ADMIN' ) )
+    if ( isset( $GLOBALS['current_screen'] ) )
+        return $GLOBALS['current_screen']->in_admin( 'user' );
+    elseif ( defined( 'WP_USER_ADMIN' ) )
         return WP_USER_ADMIN;
+
     return false;
 }