<!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>[450] wp-test.php: Network population fixes</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><a href="http://unit-tests.trac.wordpress.org/changeset/450">450</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-10-08 22:11:01 +0000 (Sat, 08 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network population fixes</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 (449 => 450)</h4>
<pre class="diff"><span>
<span class="info">--- wp-test.php 2011-10-06 21:36:31 UTC (rev 449)
+++ wp-test.php 2011-10-08 22:11:01 UTC (rev 450)
</span><span class="lines">@@ -90,13 +90,37 @@
</span><span class="cx">
</span><span class="cx"> if ( TEST_MS ) {
</span><span class="cx"> install_network();
</span><del>- $base = '/';
- populate_network( 1, 'localhost', 'null@localhost.null', 'Test Site', $base, false );
</del><ins>+ $base = $path = '/';
+ $domain = 'localhost';
+ populate_network( 1, $domain, WP_USER_EMAIL, 'Test Site', $base, false );
+ // Pulled from the !is_multiste() blocks in populate_network(). These don't run in
+ // the call to populate_network() above due to setting MULTISITE earlier in wp-test.php.
+ $site_user = get_user_by( 'email', WP_USER_EMAIL );
+ $site_admins = array( $site_user->user_login );
+ $users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
+ if ( $users ) {
+ foreach ( $users as $user ) {
+ if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
+ $site_admins[] = $user->user_login;
+ }
+ }
+ update_site_option( 'site_admins', $site_admins );
+
+ $wpdb->insert( $wpdb->blogs, array( 'site_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );
+ $blog_id = $wpdb->insert_id;
+ update_user_meta( $site_user->ID, 'source_domain', $domain );
+ update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
+ if ( !$upload_path = get_option( 'upload_path' ) ) {
+ $upload_path = substr( WP_CONTENT_DIR, strlen( ABSPATH ) ) . '/uploads';
+ update_option( 'upload_path', $upload_path );
+ }
+ update_option( 'fileupload_url', get_option( 'siteurl' ) . '/' . $upload_path );
+
</ins><span class="cx"> // wp-settings.php would normally init this stuff, but that doesn't work because we've
</span><span class="cx"> // only just installed
</span><span class="cx"> $GLOBALS['blog_id'] = 1;
</span><span class="cx"> $GLOBALS['wpdb']->blogid = 1;
</span><del>- $GLOBALS['current_blog'] = $GLOBALS['wpdb']->get_results('SELECT * from wp_blogs where blog_id=1');
</del><ins>+ $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>