WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define net and user admin constants for fetch-list case. Props scribu. fixes #15903 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-12-20 13:30:39 +00:00
parent a96f9d899f
commit 65f14e4fd3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/admin-ajax.php
View File

@ -57,6 +57,9 @@ case 'fetch-list' :
$current_screen->is_network = 'false' === $current_screen->is_network ? false : true; $current_screen->is_network = 'false' === $current_screen->is_network ? false : true;
$current_screen->is_user = 'false' === $current_screen->is_user ? false : true; $current_screen->is_user = 'false' === $current_screen->is_user ? false : true;
define( 'WP_NETWORK_ADMIN', $current_screen->is_network );
define( 'WP_USER_ADMIN', $current_screen->is_user );
$wp_list_table = get_list_table( $_GET['list_args']['class'] ); $wp_list_table = get_list_table( $_GET['list_args']['class'] );
if ( ! $wp_list_table ) if ( ! $wp_list_table )
die( '0' ); die( '0' );

5
wp-includes/load.php
View File

@ -610,11 +610,6 @@ function is_blog_admin() {
* @return bool True if inside WordPress network administration pages. * @return bool True if inside WordPress network administration pages.
*/ */
function is_network_admin() { function is_network_admin() {
if ( defined('DOING_AJAX') && function_exists('get_current_screen') ) {
$screen = get_current_screen();
return (bool) $screen->is_network;
}
if ( defined( 'WP_NETWORK_ADMIN' ) ) if ( defined( 'WP_NETWORK_ADMIN' ) )
return WP_NETWORK_ADMIN; return WP_NETWORK_ADMIN;
return false; return false;