Changeset 12858

Timestamp:

01/26/2010 10:46:09 PM (17 years ago)

Author:

ryan

Message:

Deprecate is_main_blog() for is_main_site(). see #11644

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (2 diffs)
• wp-includes/ms-settings.php (modified) (2 diffs)

trunk/wp-admin/includes/ms.php

@@ -726 +726 @@
         if ( !isset( $data[ 'post_name' ] ) || $data[ 'post_name' ] == '' )
                 return $data;
-        if ( !is_main_blog() )
+        if ( !is_main_site() )
                 return $data;
 

trunk/wp-includes/ms-deprecated.php

@@ -118 +118 @@
 }
 
+/**
+ * @deprecated 3.0
+ */
+function is_main_blog() {
+        _deprecated_function( __FUNCTION__, '3.0', 'is_main_site' );
+        return is_main_site();
+}
+
 ?>

trunk/wp-includes/ms-functions.php

@@ -79 +79 @@
                 return $wpdb->get_results( $wpdb->prepare("SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id), ARRAY_A );
 
-        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;
 }
@@ -1820 +1813 @@
 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%' )

trunk/wp-includes/ms-settings.php

@@ -66 +66 @@
                 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.' )
@@ -72 +72 @@
                 else
                         $current_site->cookie_domain = $current_site->domain;
-                        
+
                 return $current_site;
         }