vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce WP_Screen::in_admin() for determining which admin the screen is in.

Browse Source 
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


git-svn-id: https://develop.svn.wordpress.org/trunk@21687 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2012-08-31 17:16:46 +00:00
parent cb60d4a2fa
commit 7907be8f15
2 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/load.php
+16 -4
View File
@@ -583,8 +583,11 @@ function wp_clone( $object ) {
* @return bool True if inside WordPress administration pages.
*/
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;
}
@@ -599,8 +602,11 @@ function is_admin() {
* @return bool True if inside WordPress network administration pages.
*/
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;
}
@@ -615,8 +621,11 @@ function is_blog_admin() {
* @return bool True if inside WordPress network administration pages.
*/
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;
}
@@ -631,8 +640,11 @@ function is_network_admin() {
* @return bool True if inside WordPress user administration pages.
*/
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;
}