Permalink
Browse files

rearrage multisite initialization, remove deprecated $wpmuBaseTablePr…

…efix, props nacin, see #11881

git-svn-id: http://svn.automattic.com/wordpress/trunk@12885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 696a681 commit 493a307cf780178ea798b4584164080d10747166 wpmuguru committed Jan 28, 2010
Showing with 201 additions and 221 deletions.
  1. +0 −1 wp-includes/load.php
  2. +33 −19 wp-includes/ms-deprecated.php
  3. +137 −62 wp-includes/ms-load.php
  4. +29 −137 wp-includes/ms-settings.php
  5. +2 −2 wp-settings.php
View
1 wp-includes/load.php
@@ -1,5 +1,4 @@
<?php
-
/**
* These functions are needed to load WordPress.
*
View
52 wp-includes/ms-deprecated.php
@@ -14,13 +14,13 @@
/**
* @since unknown
- * @deprecated 3.0
+ * @deprecated 3.0.0
* @deprecated Use wp_generate_password()
* @see wp_generate_password()
*/
function generate_random_password( $len = 8 ) {
_deprecated_function( __FUNCTION__, '3.0', 'wp_generate_password()' );
- return wp_generate_password($len);
+ return wp_generate_password( $len );
}
/**
@@ -32,8 +32,8 @@ function generate_random_password( $len = 8 ) {
* This function must reside in a file included only if is_multisite() due to
* legacy function_exists() checks to determine if multisite is enabled.
*
- * @since unknown
- * @deprecated 3.0
+ * @since MU
+ * @deprecated 3.0.0
* @deprecated Use is_super_admin()
* @see is_super_admin()
* @see is_multisite()
@@ -56,13 +56,16 @@ function is_site_admin( $user_login = '' ) {
return is_super_admin( $user_id );
}
-if ( !function_exists('graceful_fail') ) :
+if ( !function_exists( 'graceful_fail' ) ) :
/**
- * @deprecated 3.0
+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use wp_die()
+ * @see wp_die()
*/
function graceful_fail( $message ) {
_deprecated_function( __FUNCTION__, '3.0', 'wp_die()' );
- $message = apply_filters('graceful_fail', $message);
+ $message = apply_filters( 'graceful_fail', $message );
$message_template = apply_filters( 'graceful_fail_template',
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head profile="http://gmpg.org/xfn/11">
@@ -92,41 +95,52 @@ function graceful_fail( $message ) {
endif;
/**
- * @deprecated 3.0
+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use $GLOBALS['current_user']->ID
*/
function get_current_user_id() {
- _deprecated_function( __FUNCTION__, '3.0', '' );
-
- global $current_user;
- return $current_user->ID;
+ _deprecated_function( __FUNCTION__, '3.0', '$GLOBALS\'current_user\']->ID' );
+ return $GLOBALS['current_user']->ID;
}
/**
- * @deprecated 3.0
+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use get_user_by()
+ * @see get_user_by()
*/
function get_user_details( $username ) {
_deprecated_function( __FUNCTION__, '3.0', 'get_user_by()' );
-
return get_user_by('login', $username);
}
/**
- * @deprecated 3.0
+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use clean_post_cache()
+ * @see clean_post_cache()
*/
function clear_global_post_cache( $post_id ) {
- _deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache' );
+ _deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache()' );
}
/**
- * @deprecated 3.0
+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use is_main_site()
+ * @see is_main_site()
*/
function is_main_blog() {
- _deprecated_function( __FUNCTION__, '3.0', 'is_main_site' );
+ _deprecated_function( __FUNCTION__, '3.0', 'is_main_site()' );
return is_main_site();
}
/**
- * @deprecated 3.0
+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use is_email()
+ * @see is_email()
*/
function validate_email( $email, $check_domain = true) {
_deprecated_function( __FUNCTION__, '3.0', 'is_email()' );
View
199 wp-includes/ms-load.php
@@ -1,43 +1,26 @@
<?php
/**
- * Used to setup and fix common variables and include
- * the WordPress procedural and class library.
+ * These functions are needed to load Multisite.
*
- * You should not have to change this file and allows
- * for some configuration in wp-config.php.
- *
- * @since 3.0
+ * @since 3.0.0
*
* @package WordPress
+ * @subpackage Multisite
*/
-if ( defined( 'SUNRISE' ) )
- include_once( WP_CONTENT_DIR . '/sunrise.php' );
-
-require( ABSPATH . WPINC . '/ms-settings.php' );
-$wpdb->blogid = $current_blog->blog_id;
-$wpdb->siteid = $current_blog->site_id;
-$wpdb->set_prefix($table_prefix); // set up blog tables
-$table_prefix = $wpdb->get_blog_prefix();
-
-// Fix empty PHP_SELF
-$PHP_SELF = $_SERVER['PHP_SELF'];
-if ( empty($PHP_SELF) || ( empty($PHP_SELF) && !is_subdomain_install() && $current_blog->path != '/' ) )
- $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
-
-wp_cache_init(); // need to init cache again after blog_id is set
-if ( function_exists('wp_cache_add_global_groups') ) { // need to add these again. Yes, it's an ugly hack
- wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
- wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
-}
-
-if ( !defined( 'UPLOADBLOGSDIR' ) )
- define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
-if ( !defined( 'UPLOADS' ) )
- define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+/**
+ * Whether a subdomain configuration is enabled
+ *
+ * @since 3.0
+ *
+ * @return bool True if subdomain configuration is enabled, false otherwise.
+ */
+function is_subdomain_install() {
+ if ( defined('VHOST') && VHOST == 'yes' )
+ return true;
-if ( !defined( 'BLOGUPLOADDIR' ) )
- define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+ return false;
+}
function ms_network_settings() {
global $wpdb, $current_site, $cookiehash;
@@ -112,38 +95,130 @@ function ms_site_check() {
return true;
}
-function ms_network_cookies() {
- global $current_site;
- /**
- * It is possible to define this in wp-config.php
- * @since 1.2.0
- */
- if ( !defined( 'COOKIEPATH' ) )
- define( 'COOKIEPATH', $current_site->path );
-
- /**
- * It is possible to define this in wp-config.php
- * @since 1.5.0
- */
- if ( !defined( 'SITECOOKIEPATH' ) )
- define( 'SITECOOKIEPATH', $current_site->path );
-
- /**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
- if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
- if( !is_subdomain_install() ) {
- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
+function get_current_site_name( $current_site ) {
+ global $wpdb;
+ $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" );
+ if ( !$current_site->site_name ) {
+ $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
+ if ( $current_site->site_name == null )
+ $current_site->site_name = ucfirst( $current_site->domain );
+ wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options');
+ }
+ return $current_site;
+}
+
+function wpmu_current_site() {
+ global $wpdb, $current_site, $domain, $path, $sites, $cookie_domain;
+ if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+ $current_site->id = (defined( 'SITE_ID_CURRENT_SITE' ) ? constant('SITE_ID_CURRENT_SITE') : 1);
+ $current_site->domain = DOMAIN_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 )
+ $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;
+ }
+
+ $current_site = wp_cache_get( "current_site", "site-options" );
+ if ( $current_site )
+ return $current_site;
+
+ $wpdb->suppress_errors();
+ $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
+ if ( count( $sites ) == 1 ) {
+ $current_site = $sites[0];
+ $path = $current_site->path;
+ $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
+ $current_site = get_current_site_name( $current_site );
+ if ( substr( $current_site->domain, 0, 4 ) == 'www.' )
+ $current_site->cookie_domain = substr( $current_site->domain, 4 );
+ wp_cache_set( "current_site", $current_site, "site-options" );
+ return $current_site;
+ }
+ $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) );
+
+ if ( $domain == $cookie_domain )
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path ) );
+ else
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain IN ( %s, %s ) AND path = %s ORDER BY CHAR_LENGTH( domain ) DESC LIMIT 1", $domain, $cookie_domain, $path ) );
+ if ( $current_site == null ) {
+ if ( $domain == $cookie_domain )
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain ) );
+ else
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain IN ( %s, %s ) AND path = '/' ORDER BY CHAR_LENGTH( domain ) DESC LIMIT 1", $domain, $cookie_domain, $path ) );
+ }
+ if ( $current_site != null ) {
+ $path = $current_site->path;
+ $current_site->cookie_domain = $cookie_domain;
+ return $current_site;
+ } elseif ( is_subdomain_install() ) {
+ $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) );
+ if ( $current_site != null ) {
+ $current_site->cookie_domain = $current_site->domain;
+ return $current_site;
+ }
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $sitedomain) );
+ if ( $current_site == null && defined( "WP_INSTALLING" ) == false ) {
+ if ( count( $sites ) == 1 ) {
+ $current_site = $sites[0];
+ die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
} else {
- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+ die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
}
+ } else {
+ $path = '/';
+ }
+ } elseif ( defined( "WP_INSTALLING" ) == false ) {
+ if ( count( $sites ) == 1 ) {
+ $current_site = $sites[0];
+ die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
+ } else {
+ die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
+ }
+ } else {
+ $path = '/';
}
- /**
- * It is possible to define this in wp-config.php
- * @since 2.0.0
- */
- if ( !defined('COOKIE_DOMAIN') )
- define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+ return $current_site;
}
+
+function is_installed() {
+ global $wpdb, $domain, $path;
+ $base = stripslashes( $base );
+ if ( defined( "WP_INSTALLING" ) == false ) {
+ $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" );
+ $msg = "If your blog does not display, please contact the owner of this site.<br /><br />If you are the owner of this site please check that MySQL is running properly and all tables are error free.<br /><br />";
+ if ( $check == false ) {
+ $msg .= "<strong>Database Tables Missing.</strong><br />Database tables are missing. This means that MySQL is either not running, WPMU was not installed properly, or someone deleted {$wpdb->site}. You really <em>should</em> look at your database now.<br />";
+ } else {
+ $msg .= '<strong>Could Not Find Blog!</strong><br />';
+ $msg .= "Searched for <em>" . $domain . $path . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />";
+ }
+ $msg .= "<br />\n<h1>What do I do now?</h1>";
+ $msg .= "Read the <a target='_blank' href='http://codex.wordpress.org/Debugging_WPMU'>bug report</a> page. Some of the guidelines there may help you figure out what went wrong.<br />";
+ $msg .= "If you're still stuck with this message, then check that your database contains the following tables:<ul>
+ <li> $wpdb->blogs </li>
+ <li> $wpdb->users </li>
+ <li> $wpdb->usermeta </li>
+ <li> $wpdb->site </li>
+ <li> $wpdb->sitemeta </li>
+ <li> $wpdb->sitecategories </li>
+ </ul>";
+ $msg .= "If you suspect a problem please report it to the support forums but you must include the information asked for in the <a href='http://codex.wordpress.org/Debugging_WPMU'>WPMU bug reporting guidelines</a>!<br /><br />";
+ if ( is_file( 'release-info.txt' ) ) {
+ $msg .= 'Your bug report must include the following text: "';
+ $info = file( 'release-info.txt' );
+ $msg .= $info[ 4 ] . '"';
+ }
+
+ die( "<h1>Fatal Error</h1> " . $msg );
+ }
+}
+
?>
View
166 wp-includes/ms-settings.php
@@ -1,25 +1,24 @@
<?php
-
/**
- * Whether a subdomain configuration is enabled
+ * Used to setup and fix common variables and include
+ * the Multisite procedural and class library.
*
- * @since 3.0
+ * Allows for some configuration in wp-config.php (see ms-default-constants.php)
*
- * @return bool True if subdomain configuration is enabled, false otherwise.
+ * @package WordPress
+ * @subpackage Multisite
*/
-function is_subdomain_install() {
- if ( defined('VHOST') && VHOST == 'yes' )
- return true;
- return false;
-}
+/** Include Multisite initialization functions */
+require( ABSPATH . WPINC . '/ms-load.php' );
+require( ABSPATH . WPINC . '/ms-default-constants.php' );
+
+if ( defined( 'SUNRISE' ) )
+ include_once( WP_CONTENT_DIR . '/sunrise.php' );
if ( isset( $current_site ) && isset( $current_blog ) )
return;
-// deprecated
-$wpmuBaseTablePrefix = $table_prefix;
-
$domain = addslashes( $_SERVER['HTTP_HOST'] );
if ( strpos( $domain, ':' ) ) {
if ( substr( $domain, -3 ) == ':80' ) {
@@ -45,99 +44,6 @@ function is_subdomain_install() {
$path = str_replace ( '/wp-admin/', '/', $path );
$path = preg_replace( '|(/[a-z0-9-]+?/).*|', '$1', $path );
-function get_current_site_name( $current_site ) {
- global $wpdb;
- $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" );
- if ( !$current_site->site_name ) {
- $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
- if ( $current_site->site_name == null )
- $current_site->site_name = ucfirst( $current_site->domain );
- wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options');
- }
- return $current_site;
-}
-
-function wpmu_current_site() {
- global $wpdb, $current_site, $domain, $path, $sites, $cookie_domain;
- if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
- $current_site->id = (defined( 'SITE_ID_CURRENT_SITE' ) ? constant('SITE_ID_CURRENT_SITE') : 1);
- $current_site->domain = DOMAIN_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 )
- $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;
- }
-
- $current_site = wp_cache_get( "current_site", "site-options" );
- if ( $current_site )
- return $current_site;
-
- $wpdb->suppress_errors();
- $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
- if ( count( $sites ) == 1 ) {
- $current_site = $sites[0];
- $path = $current_site->path;
- $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
- $current_site = get_current_site_name( $current_site );
- if ( substr( $current_site->domain, 0, 4 ) == 'www.' )
- $current_site->cookie_domain = substr( $current_site->domain, 4 );
- wp_cache_set( "current_site", $current_site, "site-options" );
- return $current_site;
- }
- $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) );
-
- if ( $domain == $cookie_domain )
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path ) );
- else
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain IN ( %s, %s ) AND path = %s ORDER BY CHAR_LENGTH( domain ) DESC LIMIT 1", $domain, $cookie_domain, $path ) );
- if ( $current_site == null ) {
- if ( $domain == $cookie_domain )
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain ) );
- else
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain IN ( %s, %s ) AND path = '/' ORDER BY CHAR_LENGTH( domain ) DESC LIMIT 1", $domain, $cookie_domain, $path ) );
- }
- if ( $current_site != null ) {
- $path = $current_site->path;
- $current_site->cookie_domain = $cookie_domain;
- return $current_site;
- } elseif ( is_subdomain_install() ) {
- $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) );
- if ( $current_site != null ) {
- $current_site->cookie_domain = $current_site->domain;
- return $current_site;
- }
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $sitedomain) );
- if ( $current_site == null && defined( "WP_INSTALLING" ) == false ) {
- if ( count( $sites ) == 1 ) {
- $current_site = $sites[0];
- die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
- } else {
- die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
- }
- } else {
- $path = '/';
- }
- } elseif ( defined( "WP_INSTALLING" ) == false ) {
- if ( count( $sites ) == 1 ) {
- $current_site = $sites[0];
- die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
- } else {
- die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
- }
- } else {
- $path = '/';
- }
- return $current_site;
-}
-
$current_site = wpmu_current_site();
if ( !isset( $current_site->blog_id ) )
$current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
@@ -170,7 +76,8 @@ function wpmu_current_site() {
}
}
-if ( defined( "WP_INSTALLING" ) == false && is_subdomain_install() && !is_object( $current_blog ) ) {
+if ( ! defined( 'WP_INSTALLING' ) && is_subdomain_install() && !is_object( $current_blog ) ) {
+
if ( defined( 'NOBLOGREDIRECT' ) ) {
$destination = constant( 'NOBLOGREDIRECT' );
if ( $destination == '%siteurl%' )
@@ -184,7 +91,7 @@ function wpmu_current_site() {
}
-if ( defined( "WP_INSTALLING" ) == false ) {
+if ( ! defined( 'WP_INSTALLING' ) ) {
if ( $current_site && $current_blog == null ) {
if ( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) {
header( "Location: http://" . $current_site->domain . $current_site->path );
@@ -235,37 +142,22 @@ function wpmu_current_site() {
// This just means the blog shouldn't show up in google, etc. Only to registered members
}
-function is_installed() {
- global $wpdb, $domain, $path;
- $base = stripslashes( $base );
- if ( defined( "WP_INSTALLING" ) == false ) {
- $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" );
- $msg = "If your blog does not display, please contact the owner of this site.<br /><br />If you are the owner of this site please check that MySQL is running properly and all tables are error free.<br /><br />";
- if ( $check == false ) {
- $msg .= "<strong>Database Tables Missing.</strong><br />Database tables are missing. This means that MySQL is either not running, WPMU was not installed properly, or someone deleted {$wpdb->site}. You really <em>should</em> look at your database now.<br />";
- } else {
- $msg .= '<strong>Could Not Find Blog!</strong><br />';
- $msg .= "Searched for <em>" . $domain . $path . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />";
- }
- $msg .= "<br />\n<h1>What do I do now?</h1>";
- $msg .= "Read the <a target='_blank' href='http://codex.wordpress.org/Debugging_WPMU'>bug report</a> page. Some of the guidelines there may help you figure out what went wrong.<br />";
- $msg .= "If you're still stuck with this message, then check that your database contains the following tables:<ul>
- <li> $wpdb->blogs </li>
- <li> $wpdb->users </li>
- <li> $wpdb->usermeta </li>
- <li> $wpdb->site </li>
- <li> $wpdb->sitemeta </li>
- <li> $wpdb->sitecategories </li>
- </ul>";
- $msg .= "If you suspect a problem please report it to the support forums but you must include the information asked for in the <a href='http://codex.wordpress.org/Debugging_WPMU'>WPMU bug reporting guidelines</a>!<br /><br />";
- if ( is_file( 'release-info.txt' ) ) {
- $msg .= 'Your bug report must include the following text: "';
- $info = file( 'release-info.txt' );
- $msg .= $info[ 4 ] . '"';
- }
+$wpdb->blogid = $current_blog->blog_id;
+$wpdb->siteid = $current_blog->site_id;
+$wpdb->set_prefix($table_prefix); // set up blog tables
+$table_prefix = $wpdb->get_blog_prefix();
- die( "<h1>Fatal Error</h1> " . $msg );
- }
+// Fix empty PHP_SELF
+$PHP_SELF = $_SERVER['PHP_SELF'];
+if ( empty($PHP_SELF) || ( empty($PHP_SELF) && !is_subdomain_install() && $current_blog->path != '/' ) )
+ $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
+
+wp_cache_init(); // need to init cache again after blog_id is set
+if ( function_exists('wp_cache_add_global_groups') ) { // need to add these again. Yes, it's an ugly hack
+ wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
+ wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
}
+ms_default_constants( 'uploads' );
+
?>
View
4 wp-settings.php
@@ -75,7 +75,7 @@
// Initialize multisite if enabled.
if ( is_multisite() )
- require( ABSPATH . WPINC . '/ms-load.php' );
+ require( ABSPATH . WPINC . '/ms-settings.php' );
// Load early WordPress files.
require( ABSPATH . WPINC . '/plugin.php' );
@@ -162,7 +162,7 @@
die();
}
unset($file);
- ms_network_cookies();
+ ms_default_constants( 'cookies' );
}
// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().

0 comments on commit 493a307

Please sign in to comment.