<!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" />
<title>[37475] trunk: Multisite: Wrap the main bootstrap process in a function</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37475">37475</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37475","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-20 20:56:54 +0000 (Fri, 20 May 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Multisite: Wrap the main bootstrap process in a function
Introduce `ms_load_current_site_and_network`. This is used by core during the multisite bootstrap process to populate the `$current_site` and `$current_blog` globals based on a requested domain and path.
Return values from this function inform `ms-settings.php` as to whether a page view should continue, `ms_not_installed()` should fire, or a redirect to a new location should occur.
This was previously a procedural block in `ms-settings.php`. Wrapping this code and providing specific return values allows us to write tests that do not rely on the manual and repeated inclusion of `ms-settings.php`.
This should not be used by plugins or themes. Please.
See <a href="https://core.trac.wordpress.org/ticket/34941">#34941</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludesmssettingsphp">trunk/src/wp-includes/ms-settings.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitebootstrapphp">trunk/tests/phpunit/tests/multisite/bootstrap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2016-05-20 19:20:44 UTC (rev 37474)
+++ trunk/src/wp-includes/ms-load.php 2016-05-20 20:56:54 UTC (rev 37475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,6 +261,192 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Identifies the network and site of a requested domain and path and populates the
+ * corresponding network and site global objects as part of the multisite bootstrap process.
+ *
+ * Prior to 4.6.0, this was a procedural block in `ms-settings.php`. It was wrapped into
+ * a function to facilitate unit tests. It should not be used outside of core.
+ *
+ * Usually, it's easier to query the site first, which then declares its network.
+ * In limited situations, we either can or must find the network first.
+ *
+ * If a network and site are found, a `true` response will be returned so that the
+ * request can continue.
+ *
+ * If neither a network or site is found, `false` or a URL string will be returned
+ * so that either an error can be shown or a redirect can occur.
+ *
+ * @since 4.6.0
+ * @access private
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ * @global WP_Network $current_site The current network.
+ * @global WP_Site $current_blog The current site.
+ *
+ * @param string $domain The requested domain.
+ * @param string $path The requested path.
+ * @param bool $subdomain Whether a subdomain (true) or subdirectory (false) configuration.
+ * @return bool|string True if bootstrap successfully populated `$current_blog` and `$current_site`.
+ * False if bootstrap could not be properly completed.
+ * Redirect URL if parts exist, but the request as a whole can not be fulfilled.
+ */
+function ms_load_current_site_and_network( $domain, $path, $subdomain = false ) {
+ global $wpdb, $current_site, $current_blog;
+
+ // If the network is defined in wp-config.php, we can simply use that.
+ if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+ $current_site = new stdClass;
+ $current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
+ $current_site->domain = DOMAIN_CURRENT_SITE;
+ $current_site->path = PATH_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 ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
+ $current_blog = get_site_by_path( $domain, $path );
+ } elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
+ // If the current network has a path and also matches the domain and path of the request,
+ // we need to look for a site using the first path segment following the network's path.
+ $current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
+ } else {
+ // Otherwise, use the first path segment (as usual).
+ $current_blog = get_site_by_path( $domain, $path, 1 );
+ }
+
+ } elseif ( ! $subdomain ) {
+ /*
+ * A "subdomain" install can be re-interpreted to mean "can support any domain".
+ * If we're not dealing with one of these installs, then the important part is determining
+ * the network first, because we need the network's path to identify any sites.
+ */
+ if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
+ // Are there even two networks installed?
+ $one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic]
+ if ( 1 === $wpdb->num_rows ) {
+ $current_site = new WP_Network( $one_network );
+ wp_cache_add( 'current_network', $current_site, 'site-options' );
+ } elseif ( 0 === $wpdb->num_rows ) {
+ // A network not found hook should fire here.
+ return false;
+ }
+ }
+
+ if ( empty( $current_site ) ) {
+ $current_site = WP_Network::get_by_path( $domain, $path, 1 );
+ }
+
+ if ( empty( $current_site ) ) {
+ /**
+ * Fires when a network cannot be found based on the requested domain and path.
+ *
+ * At the time of this action, the only recourse is to redirect somewhere
+ * and exit. If you want to declare a particular network, do so earlier.
+ *
+ * @since 4.4.0
+ *
+ * @param string $domain The domain used to search for a network.
+ * @param string $path The path used to search for a path.
+ */
+ do_action( 'ms_network_not_found', $domain, $path );
+
+ return false;
+ } elseif ( $path === $current_site->path ) {
+ $current_blog = get_site_by_path( $domain, $path );
+ } else {
+ // Search the network path + one more path segment (on top of the network path).
+ $current_blog = get_site_by_path( $domain, $path, substr_count( $current_site->path, '/' ) );
+ }
+ } else {
+ // Find the site by the domain and at most the first path segment.
+ $current_blog = get_site_by_path( $domain, $path, 1 );
+ if ( $current_blog ) {
+ $current_site = WP_Network::get_instance( $current_blog->site_id ? $current_blog->site_id : 1 );
+ } else {
+ // If you don't have a site with the same domain/path as a network, you're pretty screwed, but:
+ $current_site = WP_Network::get_by_path( $domain, $path, 1 );
+ }
+ }
+
+ // The network declared by the site trumps any constants.
+ if ( $current_blog && $current_blog->site_id != $current_site->id ) {
+ $current_site = WP_Network::get_instance( $current_blog->site_id );
+ }
+
+ // No network has been found, bail.
+ if ( empty( $current_site ) ) {
+ /** This action is documented in wp-includes/ms-settings.php */
+ do_action( 'ms_network_not_found', $domain, $path );
+
+ return false;
+ }
+
+ // During activation of a new subdomain, the requested site does not yet exist.
+ if ( empty( $current_blog ) && wp_installing() ) {
+ $current_blog = new stdClass;
+ $current_blog->blog_id = $blog_id = 1;
+ $current_blog->public = 1;
+ }
+
+ // No site has been found, bail.
+ if ( empty( $current_blog ) ) {
+ // We're going to redirect to the network URL, with some possible modifications.
+ $scheme = is_ssl() ? 'https' : 'http';
+ $destination = "$scheme://{$current_site->domain}{$current_site->path}";
+
+ /**
+ * Fires when a network can be determined but a site cannot.
+ *
+ * At the time of this action, the only recourse is to redirect somewhere
+ * and exit. If you want to declare a particular site, do so earlier.
+ *
+ * @since 3.9.0
+ *
+ * @param object $current_site The network that had been determined.
+ * @param string $domain The domain used to search for a site.
+ * @param string $path The path used to search for a site.
+ */
+ do_action( 'ms_site_not_found', $current_site, $domain, $path );
+
+ if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
+ // For a "subdomain" install, redirect to the signup form specifically.
+ $destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
+ } elseif ( $subdomain ) {
+ // For a "subdomain" install, the NOBLOGREDIRECT constant
+ // can be used to avoid a redirect to the signup form.
+ // Using the ms_site_not_found action is preferred to the constant.
+ if ( '%siteurl%' !== NOBLOGREDIRECT ) {
+ $destination = NOBLOGREDIRECT;
+ }
+ } elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
+ /*
+ * If the domain we were searching for matches the network's domain,
+ * it's no use redirecting back to ourselves -- it'll cause a loop.
+ * As we couldn't find a site, we're simply not installed.
+ */
+ return false;
+ }
+
+ return $destination;
+ }
+
+ // Figure out the current network's main site.
+ if ( empty( $current_site->blog_id ) ) {
+ if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
+ $current_site->blog_id = $current_blog->blog_id;
+ } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
+ $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 ) );
+ wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
+ }
+ }
+
+ return true;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Displays a failure message.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Used when a blog's tables do not exist. Checks for a missing $wpdb->site table as well.
</span></span></pre></div>
<a id="trunksrcwpincludesmssettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-settings.php 2016-05-20 19:20:44 UTC (rev 37474)
+++ trunk/src/wp-includes/ms-settings.php 2016-05-20 20:56:54 UTC (rev 37475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,12 +41,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
</span><span class="cx" style="display: block; padding: 0 10px"> ms_subdomain_constants();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// This block will process a request if the current network or current site objects
+// have not been populated in the global scope through something like `sunrise.php`.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $current_site ) || !isset( $current_blog ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Given the domain and path, let's try to identify the network and site.
- // Usually, it's easier to query the site first, which declares its network.
- // In limited situations, though, we either can or must find the network first.
-
</del><span class="cx" style="display: block; padding: 0 10px"> $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $domain, -3 ) == ':80' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $domain = substr( $domain, 0, -3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,155 +60,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> list( $path ) = explode( '?', $path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the network is defined in wp-config.php, we can simply use that.
- if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
- $current_site = new stdClass;
- $current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
- $current_site->domain = DOMAIN_CURRENT_SITE;
- $current_site->path = PATH_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;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bootstrap_result = ms_load_current_site_and_network( $domain, $path, is_subdomain_install() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
- $current_blog = get_site_by_path( $domain, $path );
- } elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
- // If the current network has a path and also matches the domain and path of the request,
- // we need to look for a site using the first path segment following the network's path.
- $current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
- } else {
- // Otherwise, use the first path segment (as usual).
- $current_blog = get_site_by_path( $domain, $path, 1 );
- }
-
- } elseif ( ! is_subdomain_install() ) {
- /*
- * A "subdomain" install can be re-interpreted to mean "can support any domain".
- * If we're not dealing with one of these installs, then the important part is determining
- * the network first, because we need the network's path to identify any sites.
- */
- if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
- // Are there even two networks installed?
- $one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic]
- if ( 1 === $wpdb->num_rows ) {
- $current_site = new WP_Network( $one_network );
- wp_cache_add( 'current_network', $current_site, 'site-options' );
- } elseif ( 0 === $wpdb->num_rows ) {
- ms_not_installed( $domain, $path );
- }
- }
- if ( empty( $current_site ) ) {
- $current_site = WP_Network::get_by_path( $domain, $path, 1 );
- }
-
- if ( empty( $current_site ) ) {
- /**
- * Fires when a network cannot be found based on the requested domain and path.
- *
- * At the time of this action, the only recourse is to redirect somewhere
- * and exit. If you want to declare a particular network, do so earlier.
- *
- * @since 4.4.0
- *
- * @param string $domain The domain used to search for a network.
- * @param string $path The path used to search for a path.
- */
- do_action( 'ms_network_not_found', $domain, $path );
-
- ms_not_installed( $domain, $path );
- } elseif ( $path === $current_site->path ) {
- $current_blog = get_site_by_path( $domain, $path );
- } else {
- // Search the network path + one more path segment (on top of the network path).
- $current_blog = get_site_by_path( $domain, $path, substr_count( $current_site->path, '/' ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === $bootstrap_result ) {
+ // `$current_blog` and `$current_site are now populated.
+ } elseif ( false === $bootstrap_result ) {
+ ms_not_installed( $domain, $path );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Find the site by the domain and at most the first path segment.
- $current_blog = get_site_by_path( $domain, $path, 1 );
- if ( $current_blog ) {
- $current_site = WP_Network::get_instance( $current_blog->site_id ? $current_blog->site_id : 1 );
- } else {
- // If you don't have a site with the same domain/path as a network, you're pretty screwed, but:
- $current_site = WP_Network::get_by_path( $domain, $path, 1 );
- }
- }
-
- // The network declared by the site trumps any constants.
- if ( $current_blog && $current_blog->site_id != $current_site->id ) {
- $current_site = WP_Network::get_instance( $current_blog->site_id );
- }
-
- // No network has been found, bail.
- if ( empty( $current_site ) ) {
- /** This action is documented in wp-includes/ms-settings.php */
- do_action( 'ms_network_not_found', $domain, $path );
-
- ms_not_installed( $domain, $path );
- }
-
- // During activation of a new subdomain, the requested site does not yet exist.
- if ( empty( $current_blog ) && wp_installing() ) {
- $current_blog = new stdClass;
- $current_blog->blog_id = $blog_id = 1;
- $current_blog->public = 1;
- }
-
- // No site has been found, bail.
- if ( empty( $current_blog ) ) {
- // We're going to redirect to the network URL, with some possible modifications.
- $scheme = is_ssl() ? 'https' : 'http';
- $destination = "$scheme://{$current_site->domain}{$current_site->path}";
-
- /**
- * Fires when a network can be determined but a site cannot.
- *
- * At the time of this action, the only recourse is to redirect somewhere
- * and exit. If you want to declare a particular site, do so earlier.
- *
- * @since 3.9.0
- *
- * @param object $current_site The network that had been determined.
- * @param string $domain The domain used to search for a site.
- * @param string $path The path used to search for a site.
- */
- do_action( 'ms_site_not_found', $current_site, $domain, $path );
-
- if ( is_subdomain_install() && ! defined( 'NOBLOGREDIRECT' ) ) {
- // For a "subdomain" install, redirect to the signup form specifically.
- $destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
- } elseif ( is_subdomain_install() ) {
- // For a "subdomain" install, the NOBLOGREDIRECT constant
- // can be used to avoid a redirect to the signup form.
- // Using the ms_site_not_found action is preferred to the constant.
- if ( '%siteurl%' !== NOBLOGREDIRECT ) {
- $destination = NOBLOGREDIRECT;
- }
- } elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
- /*
- * If the domain we were searching for matches the network's domain,
- * it's no use redirecting back to ourselves -- it'll cause a loop.
- * As we couldn't find a site, we're simply not installed.
- */
- ms_not_installed( $domain, $path );
- }
-
- header( 'Location: ' . $destination );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( 'Location: ' . $bootstrap_result );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $bootstrap_result );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Figure out the current network's main site.
- if ( empty( $current_site->blog_id ) ) {
- if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
- $current_site->blog_id = $current_blog->blog_id;
- } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
- $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 ) );
- wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $current_blog->blog_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $public = $current_blog->public;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitebootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/bootstrap.php 2016-05-20 19:20:44 UTC (rev 37474)
+++ trunk/tests/phpunit/tests/multisite/bootstrap.php 2016-05-20 20:56:54 UTC (rev 37475)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,12 +158,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => self::$site_ids[ $site_key ],
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_setup_host_request( $domain, $path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ms_load_current_site_and_network( $domain, $path );
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'network_id' => $current_blog->site_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $current_blog->blog_id,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_setup_host_request( WP_TESTS_DOMAIN, '/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ms_load_current_site_and_network( WP_TESTS_DOMAIN, '/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,13 +197,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => self::$site_ids['wordpress.org/foo/bar/'],
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'site_by_path_segments_count', array( $this, 'filter_path_segments_to_two' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_setup_host_request( 'wordpress.org', '/foo/bar/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ms_load_current_site_and_network( 'wordpress.org', '/foo/bar/' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'network_id' => $current_blog->site_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $current_blog->blog_id,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'site_by_path_segments_count', array( $this, 'filter_path_segments_to_two' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_setup_host_request( WP_TESTS_DOMAIN, '/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ms_load_current_site_and_network( WP_TESTS_DOMAIN, '/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,26 +211,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_path_segments_to_two() {
</span><span class="cx" style="display: block; padding: 0 10px"> return 2;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * Reset various globals required for a 'clean' multisite boot.
- *
- * The $wpdb and $table_prefix globals are required for ms-settings.php to
- * load properly.
- *
- * @param string $domain HTTP_HOST of the bootstrap request.
- * @param string $path REQUEST_URI of the boot strap request.
- */
- function _setup_host_request( $domain, $path ) {
- global $current_site, $current_blog, $table_prefix, $wpdb;
-
- $table_prefix = WP_TESTS_TABLE_PREFIX;
- $current_site = $current_blog = null;
- $_SERVER['HTTP_HOST'] = $domain;
- $_SERVER['REQUEST_URI'] = $path;
-
- include ABSPATH . '/wp-includes/ms-settings.php';
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre>
</div>
</div>
</body>
</html>