<!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>[27663] trunk/src/wp-includes/ms-settings.php: Introduce a ms_site_not_found filter to replace NOBLOGREDIRECT.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27663">27663</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-24 00:13:48 +0000 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/21143">#21143</a>, see <a href="http://core.trac.wordpress.org/ticket/27003">#27003</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmssettingsphp">trunk/src/wp-includes/ms-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-settings.php (27662 => 27663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-settings.php 2014-03-23 23:44:20 UTC (rev 27662)
+++ trunk/src/wp-includes/ms-settings.php 2014-03-24 00:13:48 UTC (rev 27663)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> } elseif ( ! is_subdomain_install() ) {
</span><span class="cx"> /*
</span><span class="cx"> * A "subdomain" install can be re-interpreted to mean "can support any domain".
</span><del>- * If we're not dealing with one of these installs, then the important part is determing
</del><ins>+ * If we're not dealing with one of these installs, then the important part is determining
</ins><span class="cx"> * the network first, because we need the network's path to identify any sites.
</span><span class="cx"> */
</span><span class="cx"> if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
</span><span class="lines">@@ -108,11 +108,60 @@
</span><span class="cx"> $current_site = wp_get_network( $current_blog->site_id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If we don't have a network by now, we have a problem.
</del><ins>+ // No network has been found, bail.
</ins><span class="cx"> if ( empty( $current_site ) ) {
</span><span class="cx"> ms_not_installed();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // @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;
+ }
+
</ins><span class="cx"> // @todo What if the domain of the network doesn't match the current site?
</span><span class="cx"> $current_site->cookie_domain = $current_site->domain;
</span><span class="cx"> if ( 'www.' === substr( $current_site->cookie_domain, 0, 4 ) ) {
</span><span class="lines">@@ -121,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> // Figure out the current network's main site.
</span><span class="cx"> if ( ! isset( $current_site->blog_id ) ) {
</span><del>- if ( $current_blog && $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
</del><ins>+ if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
</ins><span class="cx"> $current_site->blog_id = $current_blog->blog_id;
</span><span class="cx"> } else {
</span><span class="cx"> // @todo we should be able to cache the blog ID of a network's main site easily.
</span><span class="lines">@@ -130,34 +179,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // 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();
- }
- }
-
</del><span class="cx"> $blog_id = $current_blog->blog_id;
</span><span class="cx"> $public = $current_blog->public;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>