WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce a ms_site_not_found filter to replace NOBLOGREDIRECT. 

Move some processing down below the point where we bail if there's no site. Add more documentation.

props jeremyfelt.
fixes #21143, see #27003.

Built from https://develop.svn.wordpress.org/trunk@27663


git-svn-id: http://core.svn.wordpress.org/trunk@27506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-03-24 00:14:15 +00:00
parent 69b74a75cd
commit 1bacefa353
1 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
wp-includes/ms-settings.php
View File

@ -67,7 +67,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
} elseif ( ! is_subdomain_install() ) { } elseif ( ! is_subdomain_install() ) {
/* /*
* A "subdomain" install can be re-interpreted to mean "can support any domain". * 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 determing * 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. * the network first, because we need the network's path to identify any sites.
*/ */
if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) { if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
@ -108,11 +108,60 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
$current_site = wp_get_network( $current_blog->site_id ); $current_site = wp_get_network( $current_blog->site_id );
} }
// If we don't have a network by now, we have a problem. // No network has been found, bail.
if ( empty( $current_site ) ) { if ( empty( $current_site ) ) {
ms_not_installed(); ms_not_installed();
} }
// @todo Investigate when exactly this can occur.
if ( empty( $current_blog ) && defined( 'WP_INSTALLING' ) ) {
$current_blog = new stdClass;
$current_blog->blog_id = $blog_id = 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();
}
header( 'Location: ' . $destination );
exit;
}
// @todo What if the domain of the network doesn't match the current site? // @todo What if the domain of the network doesn't match the current site?
$current_site->cookie_domain = $current_site->domain; $current_site->cookie_domain = $current_site->domain;
if ( 'www.' === substr( $current_site->cookie_domain, 0, 4 ) ) { if ( 'www.' === substr( $current_site->cookie_domain, 0, 4 ) ) {
@ -121,7 +170,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
// Figure out the current network's main site. // Figure out the current network's main site.
if ( ! isset( $current_site->blog_id ) ) { if ( ! isset( $current_site->blog_id ) ) {
if ( $current_blog && $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) { if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
$current_site->blog_id = $current_blog->blog_id; $current_site->blog_id = $current_blog->blog_id;
} else { } else {
// @todo we should be able to cache the blog ID of a network's main site easily. // @todo we should be able to cache the blog ID of a network's main site easily.
@ -130,34 +179,6 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
} }
} }
// If we haven't figured out our site, give up.
if ( empty( $current_blog ) ) {
if ( defined( 'WP_INSTALLING' ) ) {
$current_blog->blog_id = $blog_id = 1;
} elseif ( is_subdomain_install() ) {
// @todo This is only for an open registration subdomain network.
if ( defined( 'NOBLOGREDIRECT' ) ) {
if ( '%siteurl%' === NOBLOGREDIRECT ) {
$destination = "http://" . $current_site->domain . $current_site->path;
} else {
$destination = NOBLOGREDIRECT;
}
} else {
$destination = 'http://' . $current_site->domain . $current_site->path . 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
}
header( 'Location: ' . $destination );
exit;
} else {
if ( 0 !== strcasecmp( $current_site->domain, $domain ) ) {
header( 'Location: http://' . $current_site->domain . $current_site->path );
exit;
}
ms_not_installed();
}
}
$blog_id = $current_blog->blog_id; $blog_id = $current_blog->blog_id;
$public = $current_blog->public; $public = $current_blog->public;