From cd57004569023711c96b9072944c64b25d931ea3 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 26 Jan 2010 22:46:09 +0000
Subject: [PATCH] Deprecate is_main_blog() for is_main_site(). see #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@12858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php      | 2 +-
 wp-includes/ms-deprecated.php | 8 ++++++++
 wp-includes/ms-functions.php  | 9 +--------
 wp-includes/ms-settings.php   | 4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index a000c0780..846e7522d 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -725,7 +725,7 @@ function avoid_blog_page_permalink_collision( $data, $postarr ) {
 		return $data;
 	if ( !isset( $data[ 'post_name' ] ) || $data[ 'post_name' ] == '' )
 		return $data;
-	if ( !is_main_blog() )
+	if ( !is_main_site() )
 		return $data;
 
 	$post_name = $data[ 'post_name' ];
diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 7ee59d83d..c571c65be 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -117,4 +117,12 @@ function clear_global_post_cache( $post_id ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache' );
 }
 
+/**
+ * @deprecated 3.0
+ */
+function is_main_blog() {
+	_deprecated_function( __FUNCTION__, '3.0', 'is_main_site' );
+	return is_main_site();
+}
+
 ?>
\ No newline at end of file
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index c7d9fecf7..c6aca69f2 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -81,13 +81,6 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
 	return false;
 }
 
-function is_main_blog() {
-	global $current_blog, $current_site;
-	if ( $current_blog->domain == $current_site->domain && $current_blog->path == $current_site->path )
-		return true;
-	return false;
-}
-
 function get_id_from_blogname( $name ) {
 	global $wpdb, $current_site;
 	$blog_id = wp_cache_get( "get_id_from_blogname_" . $name, 'blog-details' );
@@ -1819,7 +1812,7 @@ function signup_nonce_check( $result ) {
 
 function maybe_redirect_404() {
 	global $current_site;
-	if ( is_main_blog() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
+	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
 		$destination = constant( 'NOBLOGREDIRECT' );
 		if ( $destination == '%siteurl%' )
 			$destination = $current_site->domain . $current_site->path;
diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index fd7afcda7..f631d02ea 100644
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -65,13 +65,13 @@ function wpmu_current_site() {
 		$current_site->path   = $path = PATH_CURRENT_SITE;
 		if ( defined( 'BLOGID_CURRENT_SITE' ) )
 			$current_site->blog_id = BLOGID_CURRENT_SITE;
-		if ( DOMAIN_CURRENT_SITE == $domain ) 
+		if ( DOMAIN_CURRENT_SITE == $domain )
 			$current_site->cookie_domain = $cookie_domain;
 		elseif ( substr( $current_site->domain, 0, 4 ) == 'www.' )
 			$current_site->cookie_domain = substr( $current_site->domain, 4 );
 		else
 			$current_site->cookie_domain = $current_site->domain;
-			
+
 		return $current_site;
 	}