Index: wp-includes/admin-bar.php
===================================================================
--- wp-includes/admin-bar.php	(revision 17420)
+++ wp-includes/admin-bar.php	(working copy)
@@ -347,7 +347,7 @@
 		if ( ! is_user_logged_in() ) {
 			$show_admin_bar = false;
 		} else {
-			$context = is_admin() ? 'admin' : 'front';
+			$context = in_admin() ? 'admin' : 'front';
 			$show_admin_bar = _get_admin_bar_pref( $context );
 		}
 	}
Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 17420)
+++ wp-includes/default-filters.php	(working copy)
@@ -21,7 +21,7 @@
 
 // Strip, kses, special chars for string display
 foreach ( array( 'term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname' ) as $filter ) {
-	if ( is_admin() ) {
+	if ( in_admin() ) {
 		// These are expensive. Run only on admin pages for defense in depth.
 		add_filter( $filter, 'sanitize_text_field'  );
 		add_filter( $filter, 'wp_kses_data'       );
@@ -35,7 +35,7 @@
 }
 
 // Kses only for textarea admin displays
-if ( is_admin() ) {
+if ( in_admin() ) {
 	foreach ( array( 'term_description', 'link_description', 'link_notes', 'user_description', 'comment_text' ) as $filter ) {
 		add_filter( $filter, 'wp_kses_data' );
 	}
@@ -51,7 +51,7 @@
 // Email admin display
 foreach ( array( 'comment_author_email', 'user_email' ) as $filter ) {
 	add_filter( $filter, 'sanitize_email' );
-	if ( is_admin() )
+	if ( in_admin() )
 		add_filter( $filter, 'wp_kses_data' );
 }
 
@@ -65,10 +65,10 @@
 
 // Display URL
 foreach ( array( 'user_url', 'link_url', 'link_image', 'link_rss', 'comment_url' ) as $filter ) {
-	if ( is_admin() )
+	if ( in_admin() )
 		add_filter( $filter, 'wp_strip_all_tags' );
 	add_filter( $filter, 'esc_url'           );
-	if ( is_admin() )
+	if ( in_admin() )
 		add_filter( $filter, 'wp_kses_data'    );
 }
 
Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 17420)
+++ wp-includes/post-template.php	(working copy)
@@ -107,7 +107,7 @@
 	$title = isset($post->post_title) ? $post->post_title : '';
 	$id = isset($post->ID) ? $post->ID : (int) $id;
 
-	if ( !is_admin() ) {
+	if ( !in_admin() ) {
 		if ( !empty($post->post_password) ) {
 			$protected_title_format = apply_filters('protected_title_format', __('Protected: %s'));
 			$title = sprintf($protected_title_format, $title);
Index: wp-includes/default-widgets.php
===================================================================
--- wp-includes/default-widgets.php	(revision 17420)
+++ wp-includes/default-widgets.php	(working copy)
@@ -103,7 +103,7 @@
 		$show_images = isset($instance['images']) ? $instance['images'] : true;
 		$category = isset($instance['category']) ? $instance['category'] : false;
 
-		if ( is_admin() && !$category ) {
+		if ( in_admin() && !$category ) {
 			// Display All Links widget as such in the widgets screen
 			echo $before_widget . $before_title. __('All Links') . $after_title . $after_widget;
 			return;
@@ -784,7 +784,7 @@
 	}
 
 	if ( is_wp_error($rss) ) {
-		if ( is_admin() || current_user_can('manage_options') )
+		if ( in_admin() || current_user_can('manage_options') )
 			echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
 		return;
 	}
Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 17420)
+++ wp-includes/theme.php	(working copy)
@@ -1254,7 +1254,7 @@
 	}
 	delete_option('current_theme');
 	$theme = get_current_theme();
-	if ( is_admin() && false === get_option( "theme_mods_$stylesheet" ) ) {
+	if ( in_admin() && false === get_option( "theme_mods_$stylesheet" ) ) {
 		$default_theme_mods = (array) get_option( "mods_$theme" );
 		add_option( "theme_mods_$stylesheet", $default_theme_mods );
 	}
@@ -1309,7 +1309,7 @@
 	if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
 		$theme_name = get_current_theme();
 		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
-		if ( is_admin() && false !== $mods ) {
+		if ( in_admin() && false !== $mods ) {
 			update_option( "theme_mods_$theme_slug", $mods );
 			delete_option( "mods_$theme_name" );
 		}
@@ -1469,7 +1469,7 @@
 	add_theme_support( 'custom-header', array( 'callback' => $header_callback ) );
 	add_theme_support( 'custom-header-uploads' );
 
-	if ( ! is_admin() )
+	if ( ! in_admin() )
 		return;
 
 	global $custom_image_header;
@@ -1496,7 +1496,7 @@
 	_remove_theme_support( 'custom-header' );
 	remove_theme_support( 'custom-header-uploads' );
 
-	if ( is_admin() ) {
+	if ( in_admin() ) {
 		remove_action( 'admin_menu', array( &$GLOBALS['custom_image_header'], 'init' ) );
 		unset( $GLOBALS['custom_image_header'] );
 	}
@@ -1612,7 +1612,7 @@
 
 	add_theme_support( 'custom-background', array( 'callback' => $header_callback ) );
 
-	if ( ! is_admin() )
+	if ( ! in_admin() )
 		return;
 	require_once( ABSPATH . 'wp-admin/custom-background.php' );
 	$GLOBALS['custom_background'] =& new Custom_Background( $admin_header_callback, $admin_image_div_callback );
@@ -1635,7 +1635,7 @@
 	remove_action( 'wp_head', $callback[0]['callback'] );
 	_remove_theme_support( 'custom-background' );
 
-	if ( is_admin() ) {
+	if ( in_admin() ) {
 		remove_action( 'admin_menu', array( &$GLOBALS['custom_background'], 'init' ) );
 		unset( $GLOBALS['custom_background'] );
 	}
@@ -1705,7 +1705,7 @@
 
 	add_theme_support( 'editor-style' );
 
-	if ( ! is_admin() )
+	if ( ! in_admin() )
 		return;
 
 	global $editor_styles;
@@ -1730,7 +1730,7 @@
 	if ( ! current_theme_supports( 'editor-style' ) )
 		return false;
 	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
+	if ( in_admin() )
 		$GLOBALS['editor_styles'] = array();
 	return true;
 }
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 17420)
+++ wp-includes/functions.php	(working copy)
@@ -819,7 +819,7 @@
  */
 function wp_user_settings() {
 
-	if ( ! is_admin() )
+	if ( ! in_admin() )
 		return;
 
 	if ( defined('DOING_AJAX') )
Index: wp-includes/vars.php
===================================================================
--- wp-includes/vars.php	(revision 17420)
+++ wp-includes/vars.php	(working copy)
@@ -13,11 +13,11 @@
  */
 
 // On which page are we ?
-if ( is_admin() ) {
+if ( in_admin() ) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
+	if ( in_network_admin() )
 		preg_match('#/wp-admin/network/?(.*?)$#i', $PHP_SELF, $self_matches);
-	elseif ( is_user_admin() )
+	elseif ( in_user_admin() )
 		preg_match('#/wp-admin/user/?(.*?)$#i', $PHP_SELF, $self_matches);
 	else
 		preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
Index: wp-includes/load.php
===================================================================
--- wp-includes/load.php	(revision 17420)
+++ wp-includes/load.php	(working copy)
@@ -570,64 +570,52 @@
 }
 
 /**
- * Whether the current request is for a network or blog admin page
+ * Checks to see if the current request is inside any type of WordPress administration page. /wp-admin/*
  *
- * Does not inform on whether the user is an admin! Use capability checks to
- * tell if the user should be accessing a section or not.
+ * @since 3.1.0
  *
- * @since 1.5.1
- *
- * @return bool True if inside WordPress administration pages.
+ * @return bool True if inside any WordPress administration page.
  */
-function is_admin() {
+function in_admin() {
 	if ( defined( 'WP_ADMIN' ) )
 		return WP_ADMIN;
 	return false;
 }
 
 /**
- * Whether the current request is for a blog admin screen /wp-admin/
+ * Checks to see if the current request is inside a blog admin screen /wp-admin/
  *
- * Does not inform on whether the user is a blog admin! Use capability checks to
- * tell if the user should be accessing a section or not.
- *
  * @since 3.1.0
  *
- * @return bool True if inside WordPress network administration pages.
+ * @return bool True if inside WordPress blog administration pages.
  */
-function is_blog_admin() {
+function in_blog_admin() {
 	if ( defined( 'WP_BLOG_ADMIN' ) )
 		return WP_BLOG_ADMIN;
 	return false;
 }
 
 /**
- * Whether the current request is for a network admin screen /wp-admin/network/
+ * Checks to see if the current request is inside a network admin screen /wp-admin/network/
  *
- * Does not inform on whether the user is a network admin! Use capability checks to
- * tell if the user should be accessing a section or not.
- *
  * @since 3.1.0
  *
  * @return bool True if inside WordPress network administration pages.
  */
-function is_network_admin() {
+function in_network_admin() {
 	if ( defined( 'WP_NETWORK_ADMIN' ) )
 		return WP_NETWORK_ADMIN;
 	return false;
 }
 
 /**
- * Whether the current request is for a user admin screen /wp-admin/user/
+ * Checks to see if the current request is inside a user admin screen /wp-admin/user/
  *
- * Does not inform on whether the user is an admin! Use capability checks to
- * tell if the user should be accessing a section or not.
- *
  * @since 3.1.0
  *
  * @return bool True if inside WordPress user administration pages.
  */
-function is_user_admin() {
+function in_user_admin() {
 	if ( defined( 'WP_USER_ADMIN' ) )
 		return WP_USER_ADMIN;
 	return false;
Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php	(revision 17420)
+++ wp-includes/media.php	(working copy)
@@ -64,7 +64,7 @@
 	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
 		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
 		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && is_admin() ) // Only in admin. Assume that theme authors know what they're doing.
+		if ( intval($content_width) > 0 && in_admin() ) // Only in admin. Assume that theme authors know what they're doing.
 			$max_width = min( intval($content_width), $max_width );
 	}
 	// $size == 'full' has no constraint
Index: wp-includes/query.php
===================================================================
--- wp-includes/query.php	(revision 17420)
+++ wp-includes/query.php	(working copy)
@@ -1550,7 +1550,7 @@
 		if ( '' != $qv['preview'] )
 			$this->is_preview = true;
 
-		if ( is_admin() )
+		if ( in_admin() )
 			$this->is_admin = true;
 
 		if ( false !== strpos($qv['feed'], 'comments-') ) {
@@ -2419,7 +2419,7 @@
 				$where .= " OR $wpdb->posts.post_status = '$state'";
 			}
 
-			if ( is_admin() ) {
+			if ( in_admin() ) {
 				// Add protected states that should show in the admin all list.
 				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
 				foreach ( (array) $admin_all_states as $state )
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 17420)
+++ wp-includes/link-template.php	(working copy)
@@ -1489,7 +1489,7 @@
 	$request = preg_replace('|^'. $home_root . '|', '', $request);
 	$request = preg_replace('|^/+|', '', $request);
 
-	if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
+	if ( !$wp_rewrite->using_permalinks() || in_admin() ) {
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
 		if ( $pagenum > 1 ) {
@@ -1953,7 +1953,7 @@
 	$orig_scheme = $scheme;
 
 	if ( !in_array( $scheme, array( 'http', 'https' ) ) )
-		$scheme = is_ssl() && !is_admin() ? 'https' : 'http';
+		$scheme = is_ssl() && !in_admin() ? 'https' : 'http';
 
 	if ( empty( $blog_id ) || !is_multisite() )
 		$url = get_option( 'home' );
@@ -2206,7 +2206,7 @@
 	$orig_scheme = $scheme;
 
 	if ( !in_array($scheme, array('http', 'https')) )
-		$scheme = is_ssl() && !is_admin() ? 'https' : 'http';
+		$scheme = is_ssl() && !in_admin() ? 'https' : 'http';
 
 	$url = $scheme . '://' . $current_site->domain . $current_site->path;
 
@@ -2268,9 +2268,9 @@
  * @return string Admin url link with optional path appended
 */
 function self_admin_url($path = '', $scheme = 'admin') {
-	if ( is_network_admin() )
+	if ( in_network_admin() )
 		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
+	elseif ( in_user_admin() )
 		return user_admin_url($path, $scheme);
 	else
 		return admin_url($path, $scheme);
@@ -2326,9 +2326,9 @@
 function get_edit_profile_url( $user, $scheme = 'admin' ) {
 	$user = (int) $user;
 
-	if ( is_user_admin() )
+	if ( in_user_admin() )
 		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
+	elseif ( in_network_admin() )
 		$url = network_admin_url( 'profile.php', $scheme );
 	else
 		$url = get_dashboard_url( $user, 'profile.php', $scheme );
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 17420)
+++ wp-includes/general-template.php	(working copy)
@@ -2149,7 +2149,7 @@
 	wp_enqueue_script( 'thickbox' );
 	wp_enqueue_style( 'thickbox' );
 
-	if ( is_network_admin() )
+	if ( in_network_admin() )
 		add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
 }
 
Index: wp-includes/canonical.php
===================================================================
--- wp-includes/canonical.php	(revision 17420)
+++ wp-includes/canonical.php	(working copy)
@@ -37,7 +37,7 @@
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	global $wp_rewrite, $is_iis7, $wp_query, $wpdb;
 
-	if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_iis7 && !iis7_supports_permalinks() ) )
+	if ( is_trackback() || is_search() || is_comments_popup() || in_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_iis7 && !iis7_supports_permalinks() ) )
 		return;
 
 	if ( !$requested_url ) {
Index: wp-includes/class-wp.php
===================================================================
--- wp-includes/class-wp.php	(revision 17420)
+++ wp-includes/class-wp.php	(working copy)
@@ -468,7 +468,7 @@
 	function handle_404() {
 		global $wp_query;
 
-		if ( !is_admin() && ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_robots() && !is_search() && !is_home() ) {
+		if ( !in_admin() && ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_robots() && !is_search() && !is_home() ) {
 			// Don't 404 for these queries if they matched an object.
 			if ( ( is_tag() || is_category() || is_tax() || is_author() ) && $wp_query->get_queried_object() && !is_paged() ) {
 				if ( !is_404() )
Index: wp-includes/ms-load.php
===================================================================
--- wp-includes/ms-load.php	(revision 17420)
+++ wp-includes/ms-load.php	(working copy)
@@ -226,7 +226,7 @@
 
 	$title = /*WP_I18N_FATAL_ERROR*/'Error establishing database connection'/*/WP_I18N_FATAL_ERROR*/;
 	$msg  = '<h1>' . $title . '</h1>';
-	if ( ! is_admin() )
+	if ( ! in_admin() )
 		die( $msg );
 	$msg .= '<p>' . /*WP_I18N_CONTACT_OWNER*/'If your site does not display, please contact the owner of this network.'/*/WP_I18N_CONTACT_OWNER*/ . '';
 	$msg .= ' ' . /*WP_I18N_CHECK_MYSQL*/'If you are the owner of this network please check that MySQL is running properly and all tables are error free.'/*/WP_I18N_CHECK_MYSQL*/ . '</p>';
Index: wp-includes/deprecated.php
===================================================================
--- wp-includes/deprecated.php	(revision 17420)
+++ wp-includes/deprecated.php	(working copy)
@@ -2602,3 +2602,53 @@
 	return true;
 }
 
+/**
+ * Whether the current request is for a network or blog admin page
+ *
+ * Originally called is_admin() this was easily confused with is_super_admin()
+ * or as a function checking user caps. Replaced with in_admin() since this more
+ * accurately reflects what the function is doing.
+ *
+ * @since 3.1.0
+ * @deprecated 3.1.0
+ * @deprecated Use in_admin().
+ * @see in_admin()
+ */
+function is_admin() {
+	_deprecated_function( __FUNCTION__, '3.1', 'in_admin()' );
+
+	return in_admin();
+}
+
+/**
+ * Checks to see if the current request is inside a blog admin screen /wp-admin/
+ * Replaced with in_blog_admin()
+ *
+ * @deprecated Use in_blog_admin().
+ * @see in_blog_admin()
+ */
+function is_blog_admin() {
+	return in_blog_admin();
+}
+
+/**
+ * Checks to see if the current request is inside a network admin screen /wp-admin/network/
+ * Replaced with in_network_admin()
+ *
+ * @deprecated Use in_network_admin().
+ * @see in_network_admin()
+ */
+function is_network_admin() {
+	return in_network_admin();
+}
+
+/**
+ * Checks to see if the current request is inside a user admin screen /wp-admin/user/
+ * Replaced with in_user_admin()
+ *
+ * @deprecated Use in_user_admin().
+ * @see in_user_admin()
+ */
+function is_user_admin() {
+	return in_user_admin();
+}
\ No newline at end of file
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 17420)
+++ wp-includes/pluggable.php	(working copy)
@@ -81,7 +81,7 @@
 		return;
 
 	if ( ! $user = wp_validate_auth_cookie() ) {
-		 if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+		 if ( in_blog_admin() || in_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
 		 	wp_set_current_user(0);
 		 	return false;
 		 }
@@ -780,7 +780,7 @@
 		}
 	}
 
-	if ( is_user_admin() )
+	if ( in_user_admin() )
 		$scheme = 'logged_in';
 	else
 		$scheme = apply_filters( 'auth_redirect_scheme', '' );
Index: wp-includes/widgets.php
===================================================================
--- wp-includes/widgets.php	(revision 17420)
+++ wp-includes/widgets.php	(working copy)
@@ -999,7 +999,7 @@
 
 	// If loading from front page, consult $_wp_sidebars_widgets rather than options
 	// to see if wp_convert_widget_settings() has made manipulations in memory.
-	if ( !is_admin() ) {
+	if ( !in_admin() ) {
 		if ( empty($_wp_sidebars_widgets) )
 			$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
 
@@ -1147,7 +1147,7 @@
 		$settings = array( 2 => $settings );
 
 		// If loading from the front page, update sidebar in memory but don't save to options
-		if ( is_admin() ) {
+		if ( in_admin() ) {
 			$sidebars_widgets = get_option('sidebars_widgets');
 		} else {
 			if ( empty($GLOBALS['_wp_sidebars_widgets']) )
@@ -1167,12 +1167,12 @@
 			}
 		}
 
-		if ( is_admin() && $changed )
+		if ( in_admin() && $changed )
 			update_option('sidebars_widgets', $sidebars_widgets);
 	}
 
 	$settings['_multiwidget'] = 1;
-	if ( is_admin() )
+	if ( in_admin() )
 		update_option( $option_name, $settings );
 
 	return $settings;
Index: wp-includes/script-loader.php
===================================================================
--- wp-includes/script-loader.php	(revision 17420)
+++ wp-includes/script-loader.php	(working copy)
@@ -276,7 +276,7 @@
 
 	$scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'jquery-ui-dialog' ), '20101119' );
 
-	if ( is_admin() ) {
+	if ( in_admin() ) {
 		$scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
 		$scripts->add_data( 'ajaxcat', 'group', 1 );
 		$scripts->localize( 'ajaxcat', 'catL10n', array(
@@ -768,7 +768,7 @@
 
 	if ( ! isset($concatenate_scripts) ) {
 		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ! is_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
+		if ( ! in_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
 			$concatenate_scripts = false;
 	}
 
Index: wp-includes/class-wp-admin-bar.php
===================================================================
--- wp-includes/class-wp-admin-bar.php	(revision 17420)
+++ wp-includes/class-wp-admin-bar.php	(working copy)
@@ -185,7 +185,7 @@
 		add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
 		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 );
 
-		if ( !is_network_admin() && !is_user_admin() ) {
+		if ( !in_network_admin() && !in_user_admin() ) {
 			add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 40 );
 			add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 );
 			add_action( 'admin_bar_menu', 'wp_admin_bar_appearance_menu', 60 );
Index: wp-admin/network.php
===================================================================
--- wp-admin/network.php	(revision 17420)
+++ wp-admin/network.php	(working copy)
@@ -19,7 +19,7 @@
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
 
 if ( is_multisite() ) {
-	if ( ! is_network_admin() ) {
+	if ( ! in_network_admin() ) {
 		wp_redirect( network_admin_url( 'setup.php' ) );
 		exit;
 	}
@@ -95,7 +95,7 @@
 if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
 	wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) );
 
-if ( is_network_admin() ) {
+if ( in_network_admin() ) {
 	$title = __( 'Network Setup' );
 	$parent_file = 'settings.php';
 } else {
Index: wp-admin/includes/menu.php
===================================================================
--- wp-admin/includes/menu.php	(revision 17420)
+++ wp-admin/includes/menu.php	(working copy)
@@ -7,9 +7,9 @@
  * @subpackage Administration
  */
 
-if ( is_network_admin() )
+if ( in_network_admin() )
 	do_action('_network_admin_menu');
-elseif ( is_user_admin() )
+elseif ( in_user_admin() )
 	do_action('_user_admin_menu');
 else
 	do_action('_admin_menu');
@@ -89,9 +89,9 @@
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
 
-if ( is_network_admin() )
+if ( in_network_admin() )
 	do_action('network_admin_menu', '');
-elseif ( is_user_admin() )
+elseif ( in_user_admin() )
 	do_action('user_admin_menu', '');
 else
 	do_action('admin_menu', '');
Index: wp-admin/includes/update.php
===================================================================
--- wp-admin/includes/update.php	(revision 17420)
+++ wp-admin/includes/update.php	(working copy)
@@ -196,7 +196,7 @@
 
 	$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 
-	if ( is_network_admin() || !is_multisite() ) {
+	if ( in_network_admin() || !is_multisite() ) {
 		echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
 		if ( ! current_user_can('update_plugins') )
 			printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
Index: wp-admin/includes/dashboard.php
===================================================================
--- wp-admin/includes/dashboard.php	(revision 17420)
+++ wp-admin/includes/dashboard.php	(working copy)
@@ -26,14 +26,14 @@
 	/* Register Widgets and Controls */
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
+	if ( in_blog_admin() && current_user_can('edit_posts') )
 		wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' );
 
-	if ( is_network_admin() )
+	if ( in_network_admin() )
 		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
 
 	// Recent Comments Widget
-	if ( is_blog_admin() && current_user_can('moderate_comments') ) {
+	if ( in_blog_admin() && current_user_can('moderate_comments') ) {
 		if ( !isset( $widget_options['dashboard_recent_comments'] ) || !isset( $widget_options['dashboard_recent_comments']['items'] ) ) {
 			$update = true;
 			$widget_options['dashboard_recent_comments'] = array(
@@ -45,7 +45,7 @@
 	}
 
 	// Incoming Links Widget
-	if ( is_blog_admin() && current_user_can('publish_posts') ) {
+	if ( in_blog_admin() && current_user_can('publish_posts') ) {
 		if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) {
 			$update = true;
 			$num_items = isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10;
@@ -61,15 +61,15 @@
 	}
 
 	// WP Plugins Widget
-	if ( ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) )
+	if ( ( ! is_multisite() && in_blog_admin() && current_user_can( 'install_plugins' ) ) || ( in_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) )
 		wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' );
 
 	// QuickPress Widget
-	if ( is_blog_admin() && current_user_can('edit_posts') )
+	if ( in_blog_admin() && current_user_can('edit_posts') )
 		wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' );
 
 	// Recent Drafts
-	if ( is_blog_admin() && current_user_can('edit_posts') )
+	if ( in_blog_admin() && current_user_can('edit_posts') )
 		wp_add_dashboard_widget( 'dashboard_recent_drafts', __('Recent Drafts'), 'wp_dashboard_recent_drafts' );
 
 	// Primary feed (Dev Blog) Widget
@@ -104,10 +104,10 @@
 
 	// Hook to register new widgets
 	// Filter widget order
-	if ( is_network_admin() ) {
+	if ( in_network_admin() ) {
 		do_action( 'wp_network_dashboard_setup' );
 		$dashboard_widgets = apply_filters( 'wp_network_dashboard_widgets', array() );
-	} elseif ( is_user_admin() ) {
+	} elseif ( in_user_admin() ) {
 		do_action( 'wp_user_dashboard_setup' );
 		$dashboard_widgets = apply_filters( 'wp_user_dashboard_widgets', array() );
 	} else {
@@ -153,7 +153,7 @@
 
 	if ( is_blog_admin () )
 		$side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
-	else if (is_network_admin() )
+	else if (in_network_admin() )
 		$side_widgets = array('dashboard_primary', 'dashboard_secondary');
 	else
 		$side_widgets = array();
@@ -781,7 +781,7 @@
 	$rss = fetch_feed( $url );
 
 	if ( is_wp_error($rss) ) {
-		if ( is_admin() || current_user_can('manage_options') ) {
+		if ( in_admin() || current_user_can('manage_options') ) {
 			echo '<p>';
 			printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
 			echo '</p>';
@@ -897,7 +897,7 @@
 	$rss = @fetch_feed( $url );
 
 	if ( is_wp_error($rss) ) {
-		if ( is_admin() || current_user_can('manage_options') ) {
+		if ( in_admin() || current_user_can('manage_options') ) {
 			echo '<div class="rss-widget"><p>';
 			printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
 			echo '</p></div>';
Index: wp-admin/includes/class-wp-upgrader.php
===================================================================
--- wp-admin/includes/class-wp-upgrader.php	(revision 17420)
+++ wp-admin/includes/class-wp-upgrader.php	(working copy)
@@ -1362,7 +1362,7 @@
 		else
 			$install_actions['themes_page'] = '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() )
+		if ( ! $this->result || is_wp_error($this->result) || in_network_admin() )
 			unset( $install_actions['activate'], $install_actions['preview'] );
 
 		$install_actions = apply_filters('install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info);
Index: wp-admin/includes/theme-install.php
===================================================================
--- wp-admin/includes/theme-install.php	(revision 17420)
+++ wp-admin/includes/theme-install.php	(working copy)
@@ -141,7 +141,7 @@
 		$actions = array();
 		$actions[] = '<a href="' . self_admin_url('theme-install.php?tab=theme-information&amp;theme=' . $theme->slug .
 										'&amp;TB_iframe=true&amp;tbWidth=500&amp;tbHeight=385') . '" class="thickbox thickbox-preview onclick" title="' . esc_attr(sprintf(__('Install &#8220;%s&#8221;'), $name)) . '">' . __('Install') . '</a>';
-		if ( !is_network_admin() )
+		if ( !in_network_admin() )
 			$actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview onclick previewlink" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>';
 		$actions = apply_filters('theme_install_action_links', $actions, $theme);
 	}
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 17420)
+++ wp-admin/includes/template.php	(working copy)
@@ -1662,9 +1662,9 @@
 function convert_to_screen( $screen ) {
 	$screen = str_replace( array('.php', '-new', '-add', '-network', '-user' ), '', $screen);
 
-	if ( is_network_admin() )
+	if ( in_network_admin() )
 		$screen .= '-network';
-	elseif ( is_user_admin() )
+	elseif ( in_user_admin() )
 		$screen .= '-user';
 
 	$screen = (string) apply_filters( 'screen_meta_screen', $screen );
@@ -2094,8 +2094,8 @@
 		$current_screen->taxonomy = $taxnow;
 	}
 
-	$current_screen->is_network = is_network_admin();
-	$current_screen->is_user = is_user_admin();
+	$current_screen->is_network = in_network_admin();
+	$current_screen->is_user = in_user_admin();
 
 	if ( $current_screen->is_network ) {
 		$current_screen->base .= '-network';
Index: wp-admin/theme-editor.php
===================================================================
--- wp-admin/theme-editor.php	(revision 17420)
+++ wp-admin/theme-editor.php	(working copy)
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
+if ( is_multisite() && ! in_network_admin() ) {
 	wp_redirect( network_admin_url( 'theme-editor.php' ) );
 	exit();
 }
@@ -26,7 +26,7 @@
 $help .= '<p>' . __('After typing in your edits, click Update File.') . '</p>';
 $help .= '<p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>';
 $help .= '<p>' . __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="http://codex.wordpress.org/Child_Themes" target="_blank">child theme</a> instead.') . '</p>';
-if ( is_network_admin() )
+if ( in_network_admin() )
 	$help .= '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>';
 $help .= '<p><strong>' . __('For more information:') . '</strong></p>';
 $help .= '<p>' . __('<a href="http://codex.wordpress.org/Theme_Development" target="_blank">Documentation on Theme Development</a>') . '</p>';
Index: wp-admin/load-styles.php
===================================================================
--- wp-admin/load-styles.php	(revision 17420)
+++ wp-admin/load-styles.php	(working copy)
@@ -65,7 +65,7 @@
 /**
  * @ignore
  */
-function is_admin() {return true;}
+function in_admin() {return true;}
 
 /**
  * @ignore
Index: wp-admin/index.php
===================================================================
--- wp-admin/index.php	(revision 17420)
+++ wp-admin/index.php	(working copy)
@@ -24,7 +24,7 @@
 $title = __('Dashboard');
 $parent_file = 'index.php';
 
-if ( is_user_admin() )
+if ( in_user_admin() )
 	add_screen_option('layout_columns', array('max' => 4, 'default' => 1) );
 else
 	add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
Index: wp-admin/plugin-install.php
===================================================================
--- wp-admin/plugin-install.php	(revision 17420)
+++ wp-admin/plugin-install.php	(working copy)
@@ -15,7 +15,7 @@
 if ( ! current_user_can('install_plugins') )
 	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
 
-if ( is_multisite() && ! is_network_admin() ) {
+if ( is_multisite() && ! in_network_admin() ) {
 	wp_redirect( network_admin_url( 'plugin-install.php' ) );
 	exit();
 }
Index: wp-admin/load-scripts.php
===================================================================
--- wp-admin/load-scripts.php	(revision 17420)
+++ wp-admin/load-scripts.php	(working copy)
@@ -65,7 +65,7 @@
 /**
  * @ignore
  */
-function is_admin() {return true;}
+function in_admin() {return true;}
 
 /**
  * @ignore
Index: wp-admin/admin-header.php
===================================================================
--- wp-admin/admin-header.php	(revision 17420)
+++ wp-admin/admin-header.php	(working copy)
@@ -13,9 +13,9 @@
 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );
 
-if ( is_network_admin() )
+if ( in_network_admin() )
 	$admin_title = __( 'Network Admin' );
-elseif ( is_user_admin() )
+elseif ( in_user_admin() )
 	$admin_title = __( 'Global Dashboard' );
 else
 	$admin_title = get_bloginfo( 'name' );
@@ -107,9 +107,9 @@
 <div id="wphead">
 <?php
 
-if ( is_network_admin() )
+if ( in_network_admin() )
 	$blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
-elseif ( is_user_admin() )
+elseif ( in_user_admin() )
 	$blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
 else
 	$blog_name = get_bloginfo('name', 'display');
@@ -137,7 +137,7 @@
 	<a href="<?php echo trailingslashit( get_bloginfo( 'url' ) ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
 		<span id="site-title"><?php echo $blog_name ?></span>
 	</a>
-<?php if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
+<?php if ( !in_network_admin() && !in_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
 	<a id="privacy-on-link" href="options-privacy.php" title="<?php echo esc_attr( apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') ) ); ?>"><?php echo apply_filters('privacy_on_link_text', __('Search Engines Blocked') ); ?></a>
 <?php endif; ?>
 </h1>
@@ -150,7 +150,7 @@
 $links = array();
 $links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
 if ( is_multisite() && is_super_admin() ) {
-	if ( !is_network_admin() )
+	if ( !in_network_admin() )
 		$links[10] = '| <a href="' . network_admin_url() . '" title="' . ( ! empty( $update_title ) ? $update_title : esc_attr__('Network Admin') ) . '">' . __('Network Admin') . ( ! empty( $total_update_count ) ? ' (' . number_format_i18n( $total_update_count ) . ')' : '' ) . '</a>';
 	else
 		$links[10] = '| <a href="' . get_dashboard_url( get_current_user_id() ) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
@@ -183,9 +183,9 @@
 <?php
 screen_meta($current_screen);
 
-if ( is_network_admin() )
+if ( in_network_admin() )
 	do_action('network_admin_notices');
-elseif ( is_user_admin() )
+elseif ( in_user_admin() )
 	do_action('user_admin_notices');
 else
 	do_action('admin_notices');
Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 17420)
+++ wp-admin/plugins.php	(working copy)
@@ -249,7 +249,7 @@
 					$plugins_to_delete = count( $plugin_info );
 					echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>';
 				?>
-				<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
+				<?php if ( $have_non_network_plugins && in_network_admin() ) : ?>
 				<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo _n( 'This plugin may be active on other sites in the network.', 'These plugins may be active on other sites in the network.', $plugins_to_delete ); ?></p></div>
 				<?php endif; ?>
 				<p><?php echo _n( 'You are about to remove the following plugin:', 'You are about to remove the following plugins:', $plugins_to_delete ); ?></p>
@@ -389,7 +389,7 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
-if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
+if ( ( ! is_multisite() || in_network_admin() ) && current_user_can('install_plugins') ) { ?>
 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
 <?php }
 if ( $s )
Index: wp-admin/user-edit.php
===================================================================
--- wp-admin/user-edit.php	(revision 17420)
+++ wp-admin/user-edit.php	(working copy)
@@ -31,7 +31,7 @@
 else
 	$submenu_file = 'profile.php';
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if ( current_user_can('edit_users') && !in_user_admin() )
 	$parent_file = 'users.php';
 else
 	$parent_file = 'profile.php';
@@ -123,7 +123,7 @@
 	$blog_prefix = $wpdb->get_blog_prefix();
 	if ( $user_id != $current_user->ID ) {
 		$cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" );
-		if ( !is_network_admin() && null == $cap && $_POST[ 'role' ] == '' ) {
+		if ( !in_network_admin() && null == $cap && $_POST[ 'role' ] == '' ) {
 			$_POST[ 'role' ] = 'contributor';
 			$delete_role = true;
 		}
@@ -133,7 +133,7 @@
 	if ( $delete_role ) // stops users being added to current blog when they are edited
 		delete_user_meta( $user_id, $blog_prefix . 'capabilities' );
 
-	if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) )
+	if ( is_multisite() && in_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) )
 		empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
 }
 
@@ -231,7 +231,7 @@
 		<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
 	</tr>
 
-<?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
+<?php if ( !IS_PROFILE_PAGE && !in_network_admin() ) : ?>
 <tr><th><label for="role"><?php _e('Role:') ?></label></th>
 <td><select name="role" id="role">
 <?php
@@ -252,7 +252,7 @@
 </select>
 <?php endif; //!IS_PROFILE_PAGE
 
-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
+if ( is_multisite() && in_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
 <tr><th><label for="role"><?php _e('Super Admin'); ?></label></th>
 <td>
 <?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) ) : ?>
Index: wp-admin/theme-install.php
===================================================================
--- wp-admin/theme-install.php	(revision 17420)
+++ wp-admin/theme-install.php	(working copy)
@@ -15,7 +15,7 @@
 if ( ! current_user_can('install_themes') )
 	wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
-if ( is_multisite() && ! is_network_admin() ) {
+if ( is_multisite() && ! in_network_admin() ) {
 	wp_redirect( network_admin_url( 'theme-install.php' ) );
 	exit();
 }
@@ -31,7 +31,7 @@
 
 $title = __('Install Themes');
 $parent_file = 'themes.php';
-if ( !is_network_admin() )
+if ( !in_network_admin() )
 	$submenu_file = 'themes.php';
 
 wp_enqueue_style( 'theme-install' );
@@ -58,7 +58,7 @@
 <?php
 screen_icon();
 
-if ( is_network_admin() ) : ?>
+if ( in_network_admin() ) : ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 <?php else : ?>
 <h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
Index: wp-admin/update-core.php
===================================================================
--- wp-admin/update-core.php	(revision 17420)
+++ wp-admin/update-core.php	(working copy)
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
+if ( is_multisite() && ! in_network_admin() ) {
 	wp_redirect( network_admin_url( 'update-core.php' ) );
 	exit();
 }
Index: wp-admin/plugin-editor.php
===================================================================
--- wp-admin/plugin-editor.php	(revision 17420)
+++ wp-admin/plugin-editor.php	(working copy)
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
+if ( is_multisite() && ! in_network_admin() ) {
 	wp_redirect( network_admin_url( 'plugin-editor.php' ) );
 	exit();
 }
@@ -117,7 +117,7 @@
 		'<p>' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
 		'<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Lookup takes you to a web page about that particular function.') . '</p>' .
 		'<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.') . '</p>' .
-		( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' ) .
+		( in_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' ) .
 		'<p><strong>' . __('For more information:') . '</strong></p>' .
 		'<p>' . __('<a href="http://codex.wordpress.org/Plugins_Editor_SubPanel" target="_blank">Documentation on Editing Plugins</a>') . '</p>' .
 		'<p>' . __('<a href="http://codex.wordpress.org/Writing_a_Plugin" target="_blank">Documentation on Writing Plugins</a>') . '</p>' .