<!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>[13421] trunk/wp-includes/ms-settings.php:
always call set_blog_id after blog lookup, See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13421">13421</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-26 00:05:11 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>always call set_blog_id after blog lookup, See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13420 => 13421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-02-25 22:19:03 UTC (rev 13420)
+++ trunk/wp-includes/ms-settings.php 2010-02-26 00:05:11 UTC (rev 13421)
</span><span class="lines">@@ -16,106 +16,105 @@
</span><span class="cx"> if ( defined( 'SUNRISE' ) )
</span><span class="cx"> include_once( WP_CONTENT_DIR . '/sunrise.php' );
</span><span class="cx">
</span><del>-if ( isset( $current_site ) && isset( $current_blog ) )
- return;
</del><ins>+if ( !isset( $current_site ) || !isset( $current_blog ) ) {
</ins><span class="cx">
</span><del>-$domain = addslashes( $_SERVER['HTTP_HOST'] );
-if ( false !== strpos( $domain, ':' ) ) {
- if ( substr( $domain, -3 ) == ':80' ) {
- $domain = substr( $domain, 0, -3 );
- $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
- } elseif ( substr( $domain, -4 ) == ':443' ) {
- $domain = substr( $domain, 0, -4 );
- $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
- } else {
- wp_die( 'Multisite only works without the port number in the URL.' );
</del><ins>+ $domain = addslashes( $_SERVER['HTTP_HOST'] );
+ if ( false !== strpos( $domain, ':' ) ) {
+ if ( substr( $domain, -3 ) == ':80' ) {
+ $domain = substr( $domain, 0, -3 );
+ $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
+ } elseif ( substr( $domain, -4 ) == ':443' ) {
+ $domain = substr( $domain, 0, -4 );
+ $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
+ } else {
+ wp_die( 'Multisite only works without the port number in the URL.' );
+ }
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-$domain = rtrim( $domain, '.' );
-$cookie_domain = $domain;
-if ( substr( $cookie_domain, 0, 4 ) == 'www.' )
- $cookie_domain = substr( $cookie_domain, 4 );
</del><ins>+ $domain = rtrim( $domain, '.' );
+ $cookie_domain = $domain;
+ if ( substr( $cookie_domain, 0, 4 ) == 'www.' )
+ $cookie_domain = substr( $cookie_domain, 4 );
</ins><span class="cx">
</span><del>-$path = preg_replace( '|([a-z0-9-]+.php.*)|', '', $_SERVER['REQUEST_URI'] );
-$path = str_replace ( '/wp-admin/', '/', $path );
-$path = preg_replace( '|(/[a-z0-9-]+?/).*|', '$1', $path );
</del><ins>+ $path = preg_replace( '|([a-z0-9-]+.php.*)|', '', $_SERVER['REQUEST_URI'] );
+ $path = str_replace ( '/wp-admin/', '/', $path );
+ $path = preg_replace( '|(/[a-z0-9-]+?/).*|', '$1', $path );
</ins><span class="cx">
</span><del>-$current_site = wpmu_current_site();
-if ( ! isset( $current_site->blog_id ) )
- $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
</del><ins>+ $current_site = wpmu_current_site();
+ if ( ! isset( $current_site->blog_id ) )
+ $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
</ins><span class="cx">
</span><del>-if ( is_subdomain_install() ) {
- $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
- if ( !$current_blog ) {
- $current_blog = get_blog_details( array( 'domain' => $domain ), false );
- if ( $current_blog )
- wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
</del><ins>+ if ( is_subdomain_install() ) {
+ $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
+ if ( !$current_blog ) {
+ $current_blog = get_blog_details( array( 'domain' => $domain ), false );
+ if ( $current_blog )
+ wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
+ }
+ if ( $current_blog && $current_blog->site_id != $current_site->id )
+ $current_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $current_blog->site_id ) );
+ else
+ $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
+ } else {
+ $blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
+ if ( false !== strpos( $blogname, '/' ) )
+ $blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
+ if ( false !== strpos( $blogname, '?' ) )
+ $blogname = substr( $blogname, 0, strpos( $blogname, '?' ) );
+ $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' );
+ if ( $blogname != '' && ! in_array( $blogname, $reserved_blognames ) && ! is_file( $blogname ) )
+ $path .= $blogname . '/';
+ $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
+ if ( ! $current_blog ) {
+ $current_blog = get_blog_details( array( 'domain' => $domain, 'path' => $path ), false );
+ if ( $current_blog )
+ wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
+ }
</ins><span class="cx"> }
</span><del>- if ( $current_blog && $current_blog->site_id != $current_site->id )
- $current_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $current_blog->site_id ) );
- else
- $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
-} else {
- $blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
- if ( false !== strpos( $blogname, '/' ) )
- $blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
- if ( false !== strpos( $blogname, '?' ) )
- $blogname = substr( $blogname, 0, strpos( $blogname, '?' ) );
- $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' );
- if ( $blogname != '' && ! in_array( $blogname, $reserved_blognames ) && ! is_file( $blogname ) )
- $path .= $blogname . '/';
- $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
- if ( ! $current_blog ) {
- $current_blog = get_blog_details( array( 'domain' => $domain, 'path' => $path ), false );
- if ( $current_blog )
- wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
- }
-}
</del><span class="cx">
</span><del>-if ( ! defined( 'WP_INSTALLING' ) && is_subdomain_install() && ! is_object( $current_blog ) ) {
- if ( defined( 'NOBLOGREDIRECT' ) ) {
- $destination = NOBLOGREDIRECT;
- if ( '%siteurl%' == $destination )
- $destination = "http://" . $current_site->domain . $current_site->path;
- } else {
- $destination = 'http://' . $current_site->domain . $current_site->path . 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) && is_subdomain_install() && ! is_object( $current_blog ) ) {
+ if ( defined( 'NOBLOGREDIRECT' ) ) {
+ $destination = NOBLOGREDIRECT;
+ if ( '%siteurl%' == $destination )
+ $destination = "http://" . $current_site->domain . $current_site->path;
+ } else {
+ $destination = 'http://' . $current_site->domain . $current_site->path . 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
+ }
+ header( 'Location: ' . $destination );
+ die();
</ins><span class="cx"> }
</span><del>- header( 'Location: ' . $destination );
- die();
-}
</del><span class="cx">
</span><del>-if ( ! defined( 'WP_INSTALLING' ) ) {
- if ( $current_site && ! $current_blog ) {
- if ( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) {
- header( 'Location: http://' . $current_site->domain . $current_site->path );
- exit;
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ if ( $current_site && ! $current_blog ) {
+ if ( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) {
+ header( 'Location: http://' . $current_site->domain . $current_site->path );
+ exit;
+ }
+ $current_blog = get_blog_details( array( 'domain' => $current_site->domain, 'path' => $current_site->path ), false );
</ins><span class="cx"> }
</span><del>- $current_blog = get_blog_details( array( 'domain' => $current_site->domain, 'path' => $current_site->path ), false );
</del><ins>+ if ( ! $current_blog || ! $current_site )
+ ms_not_installed();
</ins><span class="cx"> }
</span><del>- if ( ! $current_blog || ! $current_site )
- ms_not_installed();
-}
</del><span class="cx">
</span><del>-$blog_id = $current_blog->blog_id;
-$public = $current_blog->public;
</del><ins>+ $blog_id = $current_blog->blog_id;
+ $public = $current_blog->public;
</ins><span class="cx">
</span><del>-if ( empty( $current_blog->site_id ) )
- $current_blog->site_id = 1;
-$site_id = $current_blog->site_id;
</del><ins>+ if ( empty( $current_blog->site_id ) )
+ $current_blog->site_id = 1;
+ $site_id = $current_blog->site_id;
</ins><span class="cx">
</span><del>-$current_site = get_current_site_name( $current_site );
</del><ins>+ $current_site = get_current_site_name( $current_site );
</ins><span class="cx">
</span><del>-if ( ! $blog_id ) {
- if ( defined( 'WP_INSTALLING' ) ) {
- $current_blog->blog_id = $blog_id = 1;
- } else {
- $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
- wp_die( __( 'No blog by that name on this system.' ) . $msg );
- }
</del><ins>+ if ( ! $blog_id ) {
+ if ( defined( 'WP_INSTALLING' ) ) {
+ $current_blog->blog_id = $blog_id = 1;
+ } else {
+ $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
+ wp_die( __( 'No blog by that name on this system.' ) . $msg );
+ }
+ }
</ins><span class="cx"> }
</span><del>-
-$wpdb->set_prefix( $table_prefix, false ); // set DB table prefix
</del><ins>+$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
</ins><span class="cx"> $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
</span><span class="cx"> $table_prefix = $wpdb->get_blog_prefix();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>