Changeset 13611 for trunk/wp-includes/ms-load.php

Timestamp:

03/06/2010 08:01:32 PM (15 years ago)

Author:

nacin

Message:

More network.php refinements. Bring wp-config and htaccess inline. Rename BLOGID_CURRENT_SITE to BLOG_ID_CURRENT_SITE for consistency with SITE_ID_CURRENT_SITE. see #11816

File:

• trunk/wp-includes/ms-load.php (modified) (1 diff)

trunk/wp-includes/ms-load.php

@@ -102 +102 @@
         $current_site->domain = DOMAIN_CURRENT_SITE;
         $current_site->path   = $path = PATH_CURRENT_SITE;
-        if ( defined( 'BLOGID_CURRENT_SITE' ) )
+        if ( defined( 'BLOG_ID_CURRENT_SITE' ) )
+            $current_site->blog_id = BLOG_ID_CURRENT_SITE;
+        elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) // deprecated.
             $current_site->blog_id = BLOGID_CURRENT_SITE;
         if ( DOMAIN_CURRENT_SITE == $domain )