<!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>[14000] trunk:
Prevent half-baked loading of MS that would happen when constants are added into wp-config below the wp-settings include
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14000">14000</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-05 00:00:13 +0000 (Mon, 05 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent half-baked loading of MS that would happen when constants are added into wp-config below the wp-settings include. Now it would error on the redefinition of the MULTISITE constant, instead of vague errors, and prevent any MS from loading. see <a href="http://trac.wordpress.org/ticket/12848">#12848</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.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 (13999 => 14000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-04-04 23:49:11 UTC (rev 13999)
+++ trunk/wp-includes/load.php 2010-04-05 00:00:13 UTC (rev 14000)
</span><span class="lines">@@ -568,6 +568,9 @@
</span><span class="cx"> * @return bool True if multisite is enabled, false otherwise.
</span><span class="cx"> */
</span><span class="cx"> function is_multisite() {
</span><ins>+ if ( defined( 'MULTISITE' ) && ! MULTISITE )
+ return false;
+
</ins><span class="cx"> if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (13999 => 14000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-04-04 23:49:11 UTC (rev 13999)
+++ trunk/wp-settings.php 2010-04-05 00:00:13 UTC (rev 14000)
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> require( ABSPATH . WPINC . '/ms-blogs.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/ms-settings.php' );
</span><ins>+} elseif ( ! defined( 'MULTISITE' ) ) {
+ define( 'MULTISITE', false );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Stop most of WordPress from being loaded if we just want the basics.
</span></span></pre>
</div>
</div>
</body>
</html>