<!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>[13610] trunk:
Move $base sanity check to from MS config template to ms-settings.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13610">13610</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-06 19:36:35 +0000 (Sat, 06 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move $base sanity check to from MS config template to ms-settings. see <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeswpconfigms">trunk/wp-admin/includes/wp-config.ms</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludeswpconfigms"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/wp-config.ms (13609 => 13610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/wp-config.ms 2010-03-06 18:31:10 UTC (rev 13609)
+++ trunk/wp-admin/includes/wp-config.ms 2010-03-06 19:36:35 UTC (rev 13610)
</span><span class="lines">@@ -77,10 +77,6 @@
</span><span class="cx"> */
</span><span class="cx"> define ('WPLANG', '');
</span><span class="cx">
</span><del>-// double check $base
-if( $base == 'BASE' )
- die( 'Problem in wp-config.php - $base is set to BASE when it should be the path like "/" or "/blogs/"! Please fix it!' );
-
</del><span class="cx"> // uncomment this to enable WP_CONTENT_DIR/sunrise.php support
</span><span class="cx"> //define( 'SUNRISE', 'on' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13609 => 13610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-03-06 18:31:10 UTC (rev 13609)
+++ trunk/wp-includes/ms-settings.php 2010-03-06 19:36:35 UTC (rev 13610)
</span><span class="lines">@@ -9,6 +9,10 @@
</span><span class="cx"> * @subpackage Multisite
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+// $base sanity check.
+if ( 'BASE' == $base )
+ die( 'Configuration error in <code>wp-config.php<code>. <code>$base</code> is set to "BASE" when it should be the path like "/" or "/blogs/".' );
+
</ins><span class="cx"> /** Include Multisite initialization functions */
</span><span class="cx"> require( ABSPATH . WPINC . '/ms-load.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/ms-default-constants.php' );
</span></span></pre>
</div>
</div>
</body>
</html>