<!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>[420] wp-test.php: First hacky stab at MS support</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, #logmsg > ol { margin-left: 0; 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>420</dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-08-22 22:51:44 +0000 (Mon, 22 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>First hacky stab at MS support</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestphp">wp-test.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestphp"></a>
<div class="modfile"><h4>Modified: wp-test.php (419 => 420)</h4>
<pre class="diff"><span>
<span class="info">--- wp-test.php 2011-08-22 22:13:45 UTC (rev 419)
+++ wp-test.php 2011-08-22 22:51:44 UTC (rev 420)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> if (!defined('DIR_TESTDATA'))
</span><span class="cx"> define('DIR_TESTDATA', './wp-testdata');
</span><span class="cx"> define('TEST_WP', true);
</span><del>-define('TEST_MU', (@$opts['v'] == 'mu'));
</del><ins>+define('TEST_MS', (@$opts['v'] == 'ms'));
</ins><span class="cx"> define('TEST_SKIP_KNOWN_BUGS', array_key_exists('s', $opts));
</span><span class="cx"> define('TEST_FORCE_KNOWN_BUGS', array_key_exists('f', $opts));
</span><span class="cx"> define('WP_DEBUG', array_key_exists('d', $opts) );
</span><span class="lines">@@ -49,6 +49,15 @@
</span><span class="cx">
</span><span class="cx"> // configure wp
</span><span class="cx">
</span><ins>+if ( TEST_MS ) {
+ define( 'MULTISITE', true );
+ define( 'SUBDOMAIN_INSTALL', false );
+ define( 'DOMAIN_CURRENT_SITE', 'localhost' );
+ define( 'PATH_CURRENT_SITE', '/' );
+ define( 'SITE_ID_CURRENT_SITE', 1 );
+ define( 'BLOG_ID_CURRENT_SITE', 1 );
+}
+
</ins><span class="cx"> require_once(DIR_TESTROOT.'/wp-config.php');
</span><span class="cx"> define('ABSPATH', realpath(DIR_WP).'/');
</span><span class="cx">
</span><span class="lines">@@ -76,18 +85,19 @@
</span><span class="cx">
</span><span class="cx"> drop_tables();
</span><span class="cx">
</span><del>-if (TEST_MU)
- require_once(ABSPATH.'wp-admin/upgrade-functions.php');
-else
- require_once(ABSPATH.'wp-admin/includes/upgrade.php');
</del><ins>+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
</ins><span class="cx"> wp_install(WP_BLOG_TITLE, WP_USER_NAME, WP_USER_EMAIL, true);
</span><span class="cx">
</span><del>-if (TEST_MU) {
- // wp-settings.php would normally init this stuff, but that doesn't work because we've
- // only just installed
- $GLOBALS['blog_id'] = 1;
- $GLOBALS['wpdb']->blogid = 1;
- $GLOBALS['current_blog'] = $GLOBALS['wpdb']->get_results('SELECT * from wp_blogs where blog_id=1');
</del><ins>+if ( TEST_MS ) {
+ install_network();
+ $base = get_option( 'siteurl' );
+ populate_network( 1, 'localhost', 'null@localhost', 'Test Site', $base, false );
+
+ // wp-settings.php would normally init this stuff, but that doesn't work because we've
+ // only just installed
+ $GLOBALS['blog_id'] = 1;
+ $GLOBALS['wpdb']->blogid = 1;
+ $GLOBALS['current_blog'] = $GLOBALS['wpdb']->get_results('SELECT * from wp_blogs where blog_id=1');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // make sure we're installed
</span></span></pre>
</div>
</div>
</body>
</html>