<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12885] trunk: rearrage multisite initialization,
remove deprecated $wpmuBaseTablePrefix, props nacin, see #11881</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12885">12885</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-28 16:09:52 +0000 (Thu, 28 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>rearrage multisite initialization, remove deprecated $wpmuBaseTablePrefix, props nacin, see <a href="http://trac.wordpress.org/ticket/11881">#11881</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (12884 => 12885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-01-28 15:29:23 UTC (rev 12884)
+++ trunk/wp-includes/load.php 2010-01-28 16:09:52 UTC (rev 12885)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * These functions are needed to load WordPress.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (12884 => 12885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2010-01-28 15:29:23 UTC (rev 12884)
+++ trunk/wp-includes/ms-deprecated.php 2010-01-28 16:09:52 UTC (rev 12885)
</span><span class="lines">@@ -14,13 +14,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @since unknown
</span><del>- * @deprecated 3.0
</del><ins>+ * @deprecated 3.0.0
</ins><span class="cx"> * @deprecated Use wp_generate_password()
</span><span class="cx"> * @see wp_generate_password()
</span><span class="cx"> */
</span><span class="cx"> function generate_random_password( $len = 8 ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'wp_generate_password()' );
</span><del>- return wp_generate_password($len);
</del><ins>+ return wp_generate_password( $len );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> * This function must reside in a file included only if is_multisite() due to
</span><span class="cx"> * legacy function_exists() checks to determine if multisite is enabled.
</span><span class="cx"> *
</span><del>- * @since unknown
- * @deprecated 3.0
</del><ins>+ * @since MU
+ * @deprecated 3.0.0
</ins><span class="cx"> * @deprecated Use is_super_admin()
</span><span class="cx"> * @see is_super_admin()
</span><span class="cx"> * @see is_multisite()
</span><span class="lines">@@ -56,13 +56,16 @@
</span><span class="cx"> return is_super_admin( $user_id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( !function_exists('graceful_fail') ) :
</del><ins>+if ( !function_exists( 'graceful_fail' ) ) :
</ins><span class="cx"> /**
</span><del>- * @deprecated 3.0
</del><ins>+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use wp_die()
+ * @see wp_die()
</ins><span class="cx"> */
</span><span class="cx"> function graceful_fail( $message ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'wp_die()' );
</span><del>- $message = apply_filters('graceful_fail', $message);
</del><ins>+ $message = apply_filters( 'graceful_fail', $message );
</ins><span class="cx"> $message_template = apply_filters( 'graceful_fail_template',
</span><span class="cx"> '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml"><head profile="http://gmpg.org/xfn/11">
</span><span class="lines">@@ -92,41 +95,52 @@
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @deprecated 3.0
</del><ins>+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use $GLOBALS['current_user']->ID
</ins><span class="cx"> */
</span><span class="cx"> function get_current_user_id() {
</span><del>- _deprecated_function( __FUNCTION__, '3.0', '' );
-
- global $current_user;
- return $current_user->ID;
</del><ins>+ _deprecated_function( __FUNCTION__, '3.0', '$GLOBALS\'current_user\']->ID' );
+ return $GLOBALS['current_user']->ID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @deprecated 3.0
</del><ins>+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use get_user_by()
+ * @see get_user_by()
</ins><span class="cx"> */
</span><span class="cx"> function get_user_details( $username ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'get_user_by()' );
</span><del>-
</del><span class="cx"> return get_user_by('login', $username);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @deprecated 3.0
</del><ins>+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use clean_post_cache()
+ * @see clean_post_cache()
</ins><span class="cx"> */
</span><span class="cx"> function clear_global_post_cache( $post_id ) {
</span><del>- _deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache' );
</del><ins>+ _deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache()' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @deprecated 3.0
</del><ins>+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use is_main_site()
+ * @see is_main_site()
</ins><span class="cx"> */
</span><span class="cx"> function is_main_blog() {
</span><del>- _deprecated_function( __FUNCTION__, '3.0', 'is_main_site' );
</del><ins>+ _deprecated_function( __FUNCTION__, '3.0', 'is_main_site()' );
</ins><span class="cx"> return is_main_site();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @deprecated 3.0
</del><ins>+ * @since MU
+ * @deprecated 3.0.0
+ * @deprecated Use is_email()
+ * @see is_email()
</ins><span class="cx"> */
</span><span class="cx"> function validate_email( $email, $check_domain = true) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'is_email()' );
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (12884 => 12885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-01-28 15:29:23 UTC (rev 12884)
+++ trunk/wp-includes/ms-load.php 2010-01-28 16:09:52 UTC (rev 12885)
</span><span class="lines">@@ -1,44 +1,27 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Used to setup and fix common variables and include
- * the WordPress procedural and class library.
</del><ins>+ * These functions are needed to load Multisite.
</ins><span class="cx"> *
</span><del>- * You should not have to change this file and allows
- * for some configuration in wp-config.php.
</del><ins>+ * @since 3.0.0
</ins><span class="cx"> *
</span><ins>+ * @package WordPress
+ * @subpackage Multisite
+ */
+
+/**
+ * Whether a subdomain configuration is enabled
+ *
</ins><span class="cx"> * @since 3.0
</span><span class="cx"> *
</span><del>- * @package WordPress
</del><ins>+ * @return bool True if subdomain configuration is enabled, false otherwise.
</ins><span class="cx"> */
</span><del>-if ( defined( 'SUNRISE' ) )
- include_once( WP_CONTENT_DIR . '/sunrise.php' );
</del><ins>+function is_subdomain_install() {
+ if ( defined('VHOST') && VHOST == 'yes' )
+ return true;
</ins><span class="cx">
</span><del>-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' ));
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if ( !defined( 'UPLOADBLOGSDIR' ) )
- define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
-
-if ( !defined( 'UPLOADS' ) )
- define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
-
-if ( !defined( 'BLOGUPLOADDIR' ) )
- define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
-
</del><span class="cx"> function ms_network_settings() {
</span><span class="cx"> global $wpdb, $current_site, $cookiehash;
</span><span class="cx">
</span><span class="lines">@@ -112,38 +95,130 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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 );
</del><ins>+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;
+}
</ins><span class="cx">
</span><del>- /**
- * It is possible to define this in wp-config.php
- * @since 1.5.0
- */
- if ( !defined( 'SITECOOKIEPATH' ) )
- define( 'SITECOOKIEPATH', $current_site->path );
</del><ins>+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;
</ins><span class="cx">
</span><del>- /**
- * 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 );
</del><ins>+ 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>" );
</ins><span class="cx"> } else {
</span><del>- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
</del><ins>+ 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." );
</ins><span class="cx"> }
</span><ins>+ } 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 = '/';
</ins><span class="cx"> }
</span><del>- /**
- * 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);
</del><ins>+ return $current_site;
</ins><span class="cx"> }
</span><ins>+
+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 );
+ }
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (12884 => 12885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-01-28 15:29:23 UTC (rev 12884)
+++ trunk/wp-includes/ms-settings.php 2010-01-28 16:09:52 UTC (rev 12885)
</span><span class="lines">@@ -1,25 +1,24 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><del>- * Whether a subdomain configuration is enabled
</del><ins>+ * Used to setup and fix common variables and include
+ * the Multisite procedural and class library.
</ins><span class="cx"> *
</span><del>- * @since 3.0
</del><ins>+ * Allows for some configuration in wp-config.php (see ms-default-constants.php)
</ins><span class="cx"> *
</span><del>- * @return bool True if subdomain configuration is enabled, false otherwise.
</del><ins>+ * @package WordPress
+ * @subpackage Multisite
</ins><span class="cx"> */
</span><del>-function is_subdomain_install() {
- if ( defined('VHOST') && VHOST == 'yes' )
- return true;
</del><span class="cx">
</span><del>- return false;
-}
</del><ins>+/** Include Multisite initialization functions */
+require( ABSPATH . WPINC . '/ms-load.php' );
+require( ABSPATH . WPINC . '/ms-default-constants.php' );
</ins><span class="cx">
</span><ins>+if ( defined( 'SUNRISE' ) )
+ include_once( WP_CONTENT_DIR . '/sunrise.php' );
+
</ins><span class="cx"> if ( isset( $current_site ) && isset( $current_blog ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-// deprecated
-$wpmuBaseTablePrefix = $table_prefix;
-
</del><span class="cx"> $domain = addslashes( $_SERVER['HTTP_HOST'] );
</span><span class="cx"> if ( strpos( $domain, ':' ) ) {
</span><span class="cx"> if ( substr( $domain, -3 ) == ':80' ) {
</span><span class="lines">@@ -45,99 +44,6 @@
</span><span class="cx"> $path = str_replace ( '/wp-admin/', '/', $path );
</span><span class="cx"> $path = preg_replace( '|(/[a-z0-9-]+?/).*|', '$1', $path );
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> $current_site = wpmu_current_site();
</span><span class="cx"> if ( !isset( $current_site->blog_id ) )
</span><span class="cx"> $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
</span><span class="lines">@@ -170,7 +76,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( defined( "WP_INSTALLING" ) == false && is_subdomain_install() && !is_object( $current_blog ) ) {
</del><ins>+if ( ! defined( 'WP_INSTALLING' ) && is_subdomain_install() && !is_object( $current_blog ) ) {
+
</ins><span class="cx"> if ( defined( 'NOBLOGREDIRECT' ) ) {
</span><span class="cx"> $destination = constant( 'NOBLOGREDIRECT' );
</span><span class="cx"> if ( $destination == '%siteurl%' )
</span><span class="lines">@@ -184,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( defined( "WP_INSTALLING" ) == false ) {
</del><ins>+if ( ! defined( 'WP_INSTALLING' ) ) {
</ins><span class="cx"> if ( $current_site && $current_blog == null ) {
</span><span class="cx"> if ( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) {
</span><span class="cx"> header( "Location: http://" . $current_site->domain . $current_site->path );
</span><span class="lines">@@ -235,37 +142,22 @@
</span><span class="cx"> // This just means the blog shouldn't show up in google, etc. Only to registered members
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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 ] . '"';
- }
</del><ins>+$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();
</ins><span class="cx">
</span><del>- die( "<h1>Fatal Error</h1> " . $msg );
- }
</del><ins>+// 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' ));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ms_default_constants( 'uploads' );
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (12884 => 12885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-01-28 15:29:23 UTC (rev 12884)
+++ trunk/wp-settings.php 2010-01-28 16:09:52 UTC (rev 12885)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> // Initialize multisite if enabled.
</span><span class="cx"> if ( is_multisite() )
</span><del>- require( ABSPATH . WPINC . '/ms-load.php' );
</del><ins>+ require( ABSPATH . WPINC . '/ms-settings.php' );
</ins><span class="cx">
</span><span class="cx"> // Load early WordPress files.
</span><span class="cx"> require( ABSPATH . WPINC . '/plugin.php' );
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx"> unset($file);
</span><del>- ms_network_cookies();
</del><ins>+ ms_default_constants( 'cookies' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
</span></span></pre>
</div>
</div>
</body>
</html>