<!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>[12919] trunk/wp-admin/includes/schema.php: minor fixes/
improvements to populate_network(), see #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12919">12919</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-01 18:01:23 +0000 (Mon, 01 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>minor fixes/improvements to populate_network(), see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12918 => 12919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-02-01 16:42:19 UTC (rev 12918)
+++ trunk/wp-admin/includes/schema.php 2010-02-01 18:01:23 UTC (rev 12919)
</span><span class="lines">@@ -657,12 +657,13 @@
</span><span class="cx"> /* translators: Default category slug */
</span><span class="cx"> $cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );
</span><span class="cx">
</span><del>- $wpdb->insert( $wpdb->sitecategories, array( 'site_id' => $network_id, 'cat_ID' => 1, 'cat_name' => __('Uncategorized'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
</del><ins>+ $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 1, 'cat_name' => __('Uncategorized'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
</ins><span class="cx">
</span><span class="cx"> /* translators: Default link category slug */
</span><span class="cx"> $cat_slug = sanitize_title( _x( 'Blogroll', 'Default link category slug' ) );
</span><span class="cx">
</span><del>- $wpdb->insert( $wpdb->sitecategories, array( 'site_id' => $network_id, 'cat_ID' => 2, 'cat_name' => __('Blogroll'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
</del><ins>+ $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 2, 'cat_name' => __('Blogroll'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
+ $wpdb->query( "INSERT INTO $wpdb->sitecategories (cat_id, cat_name, category_nicename, last_updated) SELECT term_id, `name`, slug, NOW() FROM $wpdb->terms WHERE term_id > 2" );
</ins><span class="cx">
</span><span class="cx"> $site_admins = array( $site_user->user_login );
</span><span class="cx"> $users = get_users_of_blog();
</span><span class="lines">@@ -727,9 +728,9 @@
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'domain' => $domain, 'path' => $path ) );
</span><del>-
</del><ins>+ $blog_id = $wpdb->insert_id;
</ins><span class="cx"> update_usermeta( $site_user->ID, 'source_domain', $domain );
</span><del>- update_usermeta( $site_user->ID, 'primary_blog', 1 );
</del><ins>+ update_usermeta( $site_user->ID, 'primary_blog', $blog_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $vhost == 'yes' )
</span></span></pre>
</div>
</div>
</body>
</html>